[Libreoffice-commits] core.git: accessibility/inc accessibility/source canvas/source chart2/source compilerplugins/clang configmgr/source connectivity/source cppuhelper/source cui/source dbaccess/source drawinglayer/source editeng/source forms/source hwpfilter/source include/canvas include/comphelper include/drawinglayer include/oox include/sfx2 include/svtools include/svx include/vcl lingucomponent/source linguistic/source oox/source sal/osl sal/textenc sax/source scaddins/source sc/source sdext/source sd/source sfx2/source slideshow/source solenv/CompilerTest_compilerplugins_clang.mk svl/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source test/source testtools/source toolkit/source unotools/source vcl/inc vcl/source writerfilter/source xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Mar 5 11:12:59 UTC 2019
accessibility/inc/extended/textwindowaccessibility.hxx | 4
accessibility/source/extended/textwindowaccessibility.cxx | 4
canvas/source/opengl/ogl_canvastools.hxx | 4
canvas/source/tools/surface.hxx | 2
chart2/source/tools/InternalData.cxx | 4
compilerplugins/clang/test/typedefparam.cxx | 80 ++
compilerplugins/clang/typedefparam.cxx | 291 ++++++++++
configmgr/source/readwriteaccess.cxx | 2
configmgr/source/rootaccess.cxx | 2
configmgr/source/rootaccess.hxx | 2
connectivity/source/drivers/mysqlc/mysqlc_connection.hxx | 6
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx | 3
connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx | 3
cppuhelper/source/implementationentry.cxx | 6
cui/source/dialogs/hangulhanjadlg.cxx | 2
dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx | 2
dbaccess/source/filter/hsqldb/hsqlimport.cxx | 21
dbaccess/source/filter/hsqldb/parseschema.cxx | 2
dbaccess/source/filter/hsqldb/rowinputbinary.cxx | 4
dbaccess/source/ui/misc/charsets.cxx | 2
drawinglayer/source/primitive2d/baseprimitive2d.cxx | 2
drawinglayer/source/primitive3d/baseprimitive3d.cxx | 2
editeng/source/misc/unolingu.cxx | 24
forms/source/solar/inc/navtoolbar.hxx | 4
forms/source/xforms/model.cxx | 8
forms/source/xforms/model.hxx | 44 -
forms/source/xforms/model_ui.cxx | 30 -
hwpfilter/source/hcode.cxx | 2
include/canvas/spriteredrawmanager.hxx | 9
include/comphelper/listenernotification.hxx | 6
include/drawinglayer/primitive2d/baseprimitive2d.hxx | 2
include/drawinglayer/primitive3d/baseprimitive3d.hxx | 2
include/oox/ppt/slidepersist.hxx | 2
include/sfx2/sfxbasecontroller.hxx | 2
include/svtools/brwbox.hxx | 2
include/svtools/editbrowsebox.hxx | 2
include/svtools/table/tablerenderer.hxx | 13
include/svx/charmap.hxx | 2
include/svx/galctrl.hxx | 2
include/svx/sdrpagewindow.hxx | 3
include/svx/svdpagv.hxx | 3
include/vcl/cairo.hxx | 5
include/vcl/fontcharmap.hxx | 6
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 6
lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx | 6
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 4
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 4
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 2
linguistic/source/hyphdsp.cxx | 6
linguistic/source/hyphdsp.hxx | 6
linguistic/source/spelldsp.cxx | 4
linguistic/source/spelldsp.hxx | 4
linguistic/source/thesdsp.cxx | 2
linguistic/source/thesdsp.hxx | 2
oox/source/mathml/import.cxx | 2
sal/osl/unx/mutex.cxx | 8
sal/textenc/tencinfo.cxx | 8
sal/textenc/textcvt.cxx | 4
sax/source/tools/fastserializer.cxx | 4
sax/source/tools/fastserializer.hxx | 4
sc/source/core/data/segmenttree.cxx | 2
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/inc/lotrange.hxx | 6
sc/source/filter/inc/workbookhelper.hxx | 2
sc/source/filter/inc/worksheethelper.hxx | 2
sc/source/filter/inc/xeescher.hxx | 7
sc/source/ui/inc/AccessibleCsvControl.hxx | 5
sc/source/ui/inc/colrowba.hxx | 2
sc/source/ui/inc/condformatuno.hxx | 4
sc/source/ui/inc/dbfunc.hxx | 2
sc/source/ui/unoobj/condformatuno.cxx | 4
sc/source/ui/view/colrowba.cxx | 2
scaddins/source/analysis/analysishelper.hxx | 2
sd/source/core/sdpage_animations.cxx | 2
sd/source/ui/sidebar/MasterPageContainer.cxx | 4
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2
sd/source/ui/sidebar/MasterPagesSelector.hxx | 2
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 16
sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 16
sdext/source/presenter/PresenterBitmapContainer.cxx | 10
sfx2/source/appl/appdispatchprovider.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/dialog/filedlgimpl.hxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/inc/macroloader.hxx | 2
sfx2/source/inc/templdgi.hxx | 2
slideshow/source/engine/animationnodes/animationaudionode.hxx | 2
slideshow/source/engine/animationnodes/animationbasenode.hxx | 2
slideshow/source/engine/shapes/backgroundshape.cxx | 2
slideshow/source/engine/shapes/backgroundshape.hxx | 3
slideshow/source/engine/shapes/drawshapesubsetting.hxx | 5
slideshow/source/engine/shapes/mediashape.hxx | 3
slideshow/source/engine/slide/layer.hxx | 11
slideshow/source/engine/slide/layermanager.cxx | 2
slideshow/source/engine/slide/shapemanagerimpl.hxx | 12
slideshow/source/engine/slideview.cxx | 6
slideshow/source/engine/transitions/slidechangebase.cxx | 2
slideshow/source/engine/transitions/slidechangebase.hxx | 22
slideshow/source/inc/animationnode.hxx | 10
slideshow/source/inc/basecontainernode.hxx | 8
slideshow/source/inc/basenode.hxx | 11
slideshow/source/inc/eventmultiplexer.hxx | 8
slideshow/source/inc/hslcoloranimation.hxx | 4
slideshow/source/inc/numberanimation.hxx | 4
slideshow/source/inc/pairanimation.hxx | 4
slideshow/source/inc/shape.hxx | 8
slideshow/source/inc/shapemanager.hxx | 13
slideshow/source/inc/slide.hxx | 2
slideshow/source/inc/slideshowcontext.hxx | 3
slideshow/source/inc/subsettableshapemanager.hxx | 11
slideshow/source/inc/tools.hxx | 61 +-
slideshow/source/inc/view.hxx | 2
slideshow/source/inc/viewlayer.hxx | 14
solenv/CompilerTest_compilerplugins_clang.mk | 1
svl/source/numbers/numfmuno.cxx | 12
svl/source/numbers/numfmuno.hxx | 14
svtools/inc/table/gridtablerenderer.hxx | 10
svtools/source/brwbox/editbrowsebox.cxx | 2
svtools/source/table/gridtablerenderer.cxx | 2
svtools/source/table/tablecontrol.cxx | 2
svtools/source/table/tablecontrol_impl.cxx | 2
svx/inc/svdibrow.hxx | 2
svx/source/fmcomp/gridcell.cxx | 6
svx/source/form/navigatortree.cxx | 2
svx/source/svdraw/svdcrtv.cxx | 2
svx/source/svdraw/svdibrow.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 4
sw/inc/crsrsh.hxx | 2
sw/inc/doc.hxx | 4
sw/inc/swatrset.hxx | 6
sw/inc/swtypes.hxx | 3
sw/source/core/SwNumberTree/SwNumberTree.cxx | 4
sw/source/core/doc/docfmt.cxx | 2
sw/source/core/inc/frmtool.hxx | 10
sw/source/core/inc/paintfrm.hxx | 5
sw/source/core/view/viewsh.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 2
sw/source/filter/ww8/wrtww8.hxx | 3
sw/source/filter/ww8/ww8scan.hxx | 16
test/source/diff/diff.cxx | 2
testtools/source/bridgetest/cppobj.cxx | 28
toolkit/source/awt/vclxwindows.cxx | 20
toolkit/source/controls/unocontrols.cxx | 24
unotools/source/config/bootstrap.cxx | 8
vcl/inc/unx/cpdmgr.hxx | 4
vcl/inc/unx/gtk/glomenu.h | 2
vcl/source/filter/igif/decode.hxx | 2
vcl/source/fontsubset/cff.cxx | 10
writerfilter/source/dmapper/BorderHandler.hxx | 5
writerfilter/source/dmapper/CellColorHandler.hxx | 3
writerfilter/source/dmapper/DomainMapper.hxx | 9
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 6
writerfilter/source/dmapper/PropertyMap.hxx | 7
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 8
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 8
xmloff/source/text/txtparae.cxx | 2
157 files changed, 859 insertions(+), 455 deletions(-)
New commits:
commit 191f85df5851473af270be486f95f940e3091fef
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 4 08:57:28 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Mar 5 12:12:26 2019 +0100
re-land "new loplugin typedefparam""
This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad,
and adds a bunch more fixes.
Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a
Reviewed-on: https://gerrit.libreoffice.org/68680
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index dd211b0883a9..422b5924c7b1 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -211,9 +211,9 @@ private:
virtual void SAL_CALL grabFocus() override;
- virtual css::util::Color SAL_CALL getForeground() override;
+ virtual sal_Int32 SAL_CALL getForeground() override;
- virtual css::util::Color SAL_CALL getBackground() override;
+ virtual sal_Int32 SAL_CALL getBackground() override;
virtual ::sal_Int32 SAL_CALL getCaretPosition() override;
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 005b597e97ac..b629710691c3 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -275,13 +275,13 @@ void SAL_CALL Paragraph::grabFocus()
}
// virtual
-css::util::Color SAL_CALL Paragraph::getForeground()
+sal_Int32 SAL_CALL Paragraph::getForeground()
{
return 0; // TODO
}
// virtual
-css::util::Color SAL_CALL Paragraph::getBackground()
+sal_Int32 SAL_CALL Paragraph::getBackground()
{
return 0; // TODO
}
diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx
index 4382258107eb..0378626571d5 100644
--- a/canvas/source/opengl/ogl_canvastools.hxx
+++ b/canvas/source/opengl/ogl_canvastools.hxx
@@ -26,8 +26,8 @@ namespace oglcanvas
void renderComplexPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
void renderPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
void setupState( const ::basegfx::B2DHomMatrix& rTransform,
- unsigned int eSrcBlend,
- unsigned int eDstBlend,
+ GLenum eSrcBlend,
+ GLenum eDstBlend,
const com::sun::star::rendering::ARGBColor& rColor );
void renderOSD( const std::vector<double>& rNumbers, double scale );
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index ac45ea1965f1..b941e9d09618 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -87,7 +87,7 @@ namespace canvas
bool drawRectangularArea(
double fAlpha,
const ::basegfx::B2DPoint& rPos,
- const ::basegfx::B2DRange& rArea,
+ const ::basegfx::B2DRectangle& rArea,
const ::basegfx::B2DHomMatrix& rTransform );
/** Render the surface content to screen.
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index e82dd86a4bd5..b99578fab118 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -472,7 +472,7 @@ void InternalData::deleteRow( sal_Int32 nAtIndex )
dump();
}
-void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNewRowLabels )
+void InternalData::setComplexRowLabels( const tVecVecAny& rNewRowLabels )
{
m_aRowLabels = rNewRowLabels;
sal_Int32 nNewRowCount = static_cast< sal_Int32 >( m_aRowLabels.size() );
@@ -487,7 +487,7 @@ const InternalData::tVecVecAny& InternalData::getComplexRowLabels() const
return m_aRowLabels;
}
-void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& rNewColumnLabels )
+void InternalData::setComplexColumnLabels( const tVecVecAny& rNewColumnLabels )
{
m_aColumnLabels = rNewColumnLabels;
sal_Int32 nNewColumnCount = static_cast< sal_Int32 >( m_aColumnLabels.size() );
diff --git a/compilerplugins/clang/test/typedefparam.cxx b/compilerplugins/clang/test/typedefparam.cxx
new file mode 100644
index 000000000000..ed2f8d7017a3
--- /dev/null
+++ b/compilerplugins/clang/test/typedefparam.cxx
@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "tools/solar.h"
+
+namespace test1
+{
+class Foo
+{
+ void bar(sal_uIntPtr x); // expected-note {{declaration site here [loplugin:typedefparam]}}
+ sal_uIntPtr bar(); // expected-note {{declaration site here [loplugin:typedefparam]}}
+};
+
+void Foo::bar(sal_uLong)
+// expected-error at -1 {{function param 0 at definition site does not match function param at declaration site, 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
+{
+}
+
+sal_uLong Foo::bar()
+// expected-error at -1 {{function return type at definition site does not match function param at declaration site, 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
+{
+ return 1;
+}
+};
+
+// Carve out an exception for the "typedef struct S {...} T" idiom we use in the UNO code
+namespace test2
+{
+typedef struct Foo
+{
+ int x;
+} FooT;
+
+void bar(struct Foo*);
+
+void bar(FooT*){
+ // no warning expected
+};
+};
+namespace test3
+{
+typedef struct Foo
+{
+ int x;
+} FooT;
+
+void bar(Foo*);
+
+void bar(FooT*){
+ // no warning expected
+};
+};
+
+// check method overrides
+namespace test4
+{
+struct Struct1
+{
+ virtual sal_uIntPtr foo1();
+ // expected-note at -1 {{super-class method here [loplugin:typedefparam]}}
+ virtual void foo2(sal_uIntPtr);
+ // expected-note at -1 {{super-class method here [loplugin:typedefparam]}}
+ virtual ~Struct1();
+};
+struct Struct2 : public Struct1
+{
+ virtual sal_uLong foo1() override;
+ // expected-error at -1 {{method return type does not match overridden method 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
+ virtual void foo2(sal_uLong) override;
+ // expected-error at -1 {{method param 0 does not match overridden method param 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
+};
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/typedefparam.cxx b/compilerplugins/clang/typedefparam.cxx
new file mode 100644
index 000000000000..b3fa70f97532
--- /dev/null
+++ b/compilerplugins/clang/typedefparam.cxx
@@ -0,0 +1,291 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <set>
+#include "plugin.hxx"
+
+/**
+ Check that parameters at the declaration site and the definition site are the same.
+ This can be important when refactoring, and can sometimes make a difference when compiling
+ for platforms with different pointer-sizes (e.g. 32 vs 64 bit)
+ */
+namespace
+{
+class TypedefParam : public loplugin::FilteringRewritePlugin<TypedefParam>
+{
+public:
+ explicit TypedefParam(loplugin::InstantiationData const& data)
+ : FilteringRewritePlugin(data)
+ {
+ }
+
+ virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+ bool VisitFunctionDecl(FunctionDecl const*);
+ bool VisitCXXMethodDecl(CXXMethodDecl const*);
+};
+
+static bool areTypesEqual(QualType lhs, QualType rhs);
+
+bool TypedefParam::VisitFunctionDecl(FunctionDecl const* functionDecl)
+{
+ if (ignoreLocation(functionDecl))
+ return true;
+ if (functionDecl->isFunctionTemplateSpecialization())
+ return true;
+ auto canonicalDecl = functionDecl->getCanonicalDecl();
+ if (canonicalDecl == functionDecl)
+ return true;
+
+ for (unsigned i = 0; i < functionDecl->getNumParams(); ++i)
+ {
+ ParmVarDecl const* thisParam = functionDecl->getParamDecl(i);
+ ParmVarDecl const* canonicalParam = canonicalDecl->getParamDecl(i);
+ if (!areTypesEqual(thisParam->getType(), canonicalParam->getType()))
+ {
+ report(DiagnosticsEngine::Warning,
+ "function param %0 at definition site does not match function param at "
+ "declaration site, %1 vs %2",
+ compat::getBeginLoc(functionDecl))
+ << i << thisParam->getType() << canonicalParam->getType()
+ << functionDecl->getSourceRange();
+ report(DiagnosticsEngine::Note, "declaration site here",
+ compat::getBeginLoc(canonicalDecl))
+ << canonicalDecl->getSourceRange();
+ thisParam->getType()->dump();
+ canonicalParam->getType()->dump();
+ }
+ }
+
+ if (!areTypesEqual(functionDecl->getReturnType(), canonicalDecl->getReturnType()))
+ {
+ report(DiagnosticsEngine::Warning,
+ "function return type at definition site does not match function param at "
+ "declaration site, %0 vs %1",
+ compat::getBeginLoc(functionDecl))
+ << functionDecl->getReturnType() << canonicalDecl->getReturnType()
+ << functionDecl->getSourceRange();
+ report(DiagnosticsEngine::Note, "declaration site here", compat::getBeginLoc(canonicalDecl))
+ << canonicalDecl->getSourceRange();
+ functionDecl->getReturnType()->dump();
+ canonicalDecl->getReturnType()->dump();
+ }
+ return true;
+}
+
+bool TypedefParam::VisitCXXMethodDecl(CXXMethodDecl const* methodDecl)
+{
+ if (ignoreLocation(methodDecl))
+ return true;
+ if (methodDecl->isFunctionTemplateSpecialization())
+ return true;
+ // only warn on the declaration site
+ if (methodDecl->getCanonicalDecl() != methodDecl)
+ return true;
+
+ StringRef aFileName = getFileNameOfSpellingLoc(
+ compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(methodDecl)));
+ // seems to be using typedefs as a form of documentation for method params
+ if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/sw/source/filter/ww8/ww8scan.hxx"))
+ return true;
+ // necessary to work around changes in popplers API
+ if (loplugin::hasPathnamePrefix(aFileName, SRCDIR
+ "/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx"))
+ return true;
+
+ for (auto superMethodIt = methodDecl->begin_overridden_methods();
+ superMethodIt != methodDecl->end_overridden_methods(); ++superMethodIt)
+ {
+ const CXXMethodDecl* superMethodDecl = *superMethodIt;
+ int i = 0;
+ for (const ParmVarDecl* superParmVarDecl : superMethodDecl->parameters())
+ {
+ const ParmVarDecl* parmVarDecl = methodDecl->getParamDecl(i);
+ if (!areTypesEqual(parmVarDecl->getType(), superParmVarDecl->getType()))
+ {
+ report(DiagnosticsEngine::Warning,
+ "method param %0 does not match overridden method param "
+ "%1 vs %2",
+ compat::getBeginLoc(methodDecl))
+ << i << parmVarDecl->getType() << superParmVarDecl->getType()
+ << methodDecl->getSourceRange();
+ report(DiagnosticsEngine::Note, "super-class method here",
+ compat::getBeginLoc(superMethodDecl))
+ << superMethodDecl->getSourceRange();
+ parmVarDecl->getType()->dump();
+ superParmVarDecl->getType()->dump();
+ }
+ ++i;
+ }
+
+ // it is quite normal to override a method and return a more specific pointer/reference type
+ auto returnType = methodDecl->getReturnType();
+ if (!returnType->isPointerType() && !returnType->isReferenceType())
+ if (!areTypesEqual(returnType, superMethodDecl->getReturnType()))
+ {
+ report(DiagnosticsEngine::Warning,
+ "method return type does not match overridden method "
+ "%0 vs %1",
+ compat::getBeginLoc(methodDecl))
+ << methodDecl->getReturnType() << superMethodDecl->getReturnType()
+ << methodDecl->getSourceRange();
+ report(DiagnosticsEngine::Note, "super-class method here",
+ compat::getBeginLoc(superMethodDecl))
+ << superMethodDecl->getSourceRange();
+ returnType->dump();
+ superMethodDecl->getReturnType()->dump();
+ }
+ }
+ return true;
+}
+
+static bool areTypesEqual(QualType lhs, QualType rhs)
+{
+ if (lhs == rhs)
+ return true;
+
+ // ignore template stuff
+ if (lhs->isDependentType() || rhs->isDependentType())
+ return true;
+ // there are some places, e.g. chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+ // where just unwrapping these types does not work, so just ignore them
+ if (isa<SubstTemplateTypeParmType>(lhs) || isa<SubstTemplateTypeParmType>(rhs))
+ return true;
+
+ auto lhsType = lhs.getTypePtr();
+ auto rhsType = rhs.getTypePtr();
+
+ // this is the carve-out exception for the "typedef struct S {...} T" idiom we use in the UNO code
+ if (auto lhsPointer = dyn_cast<clang::PointerType>(lhsType))
+ {
+ if (auto rhsPointer = dyn_cast<clang::PointerType>(rhsType))
+ {
+ auto extractRecordType = [](clang::QualType type) {
+ auto recordType = dyn_cast<RecordType>(type);
+ if (recordType)
+ return recordType;
+ auto elaboratedType = dyn_cast<ElaboratedType>(type);
+ if (!elaboratedType)
+ return static_cast<const clang::RecordType*>(nullptr);
+ return dyn_cast<RecordType>(elaboratedType->desugar());
+ };
+ auto containsTypedefToRecord = [](clang::QualType type, RecordType const* recordType) {
+ TypedefType const* typedefType = dyn_cast<TypedefType>(type);
+ if (!typedefType)
+ return false;
+ auto tmp = typedefType->desugar();
+ if (auto elaboratedType = dyn_cast<ElaboratedType>(tmp))
+ tmp = elaboratedType->desugar();
+ return tmp.getTypePtr() == recordType;
+ };
+ if (auto recordType = extractRecordType(lhsPointer->getPointeeType()))
+ if (containsTypedefToRecord(rhsPointer->getPointeeType(), recordType))
+ return true;
+ if (auto recordType = extractRecordType(rhsPointer->getPointeeType()))
+ if (containsTypedefToRecord(lhsPointer->getPointeeType(), recordType))
+ return true;
+ }
+ }
+
+ if (auto lhsElaborated = dyn_cast<ElaboratedType>(lhsType))
+ {
+ return areTypesEqual(lhsElaborated->getNamedType(), rhs);
+ }
+ if (auto rhsElaborated = dyn_cast<ElaboratedType>(rhsType))
+ {
+ return areTypesEqual(lhs, rhsElaborated->getNamedType());
+ }
+ if (auto lhsTemplate = dyn_cast<TemplateSpecializationType>(lhsType))
+ {
+ return areTypesEqual(lhsTemplate->desugar(), rhs);
+ }
+ if (auto rhsTemplate = dyn_cast<TemplateSpecializationType>(rhsType))
+ {
+ return areTypesEqual(lhs, rhsTemplate->desugar());
+ }
+
+ if (auto lhsLValue = dyn_cast<LValueReferenceType>(lhsType))
+ {
+ auto rhsLValue = dyn_cast<LValueReferenceType>(rhsType);
+ if (!rhsLValue)
+ return false;
+ return areTypesEqual(lhsLValue->getPointeeType(), rhsLValue->getPointeeType());
+ }
+ if (auto lhsRValue = dyn_cast<RValueReferenceType>(lhsType))
+ {
+ auto rhsRValue = dyn_cast<RValueReferenceType>(rhsType);
+ if (!rhsRValue)
+ return false;
+ return areTypesEqual(lhsRValue->getPointeeType(), rhsRValue->getPointeeType());
+ }
+ if (auto lhsPointer = dyn_cast<clang::PointerType>(lhsType))
+ {
+ auto rhsPointer = dyn_cast<clang::PointerType>(rhsType);
+ if (!rhsPointer)
+ return false;
+ return areTypesEqual(lhsPointer->getPointeeType(), rhsPointer->getPointeeType());
+ }
+ if (auto lhsTypedef = dyn_cast<TypedefType>(lhsType))
+ {
+ auto rhsTypedef = dyn_cast<TypedefType>(rhsType);
+ if (!rhsTypedef)
+ return false;
+ // comparing the underlying Decl's here doesn't work, they are not uniqued
+ if (lhsTypedef->getDecl()->getName() != rhsTypedef->getDecl()->getName())
+ return false;
+ return areTypesEqual(lhsTypedef->desugar(), rhsTypedef->desugar());
+ }
+ if (auto lhsTemplate = dyn_cast<TemplateSpecializationType>(lhsType))
+ {
+ auto rhsTemplate = dyn_cast<TemplateSpecializationType>(rhsType);
+ if (!rhsTemplate)
+ return false;
+ return areTypesEqual(lhsTemplate->desugar(), rhsTemplate->desugar());
+ }
+ if (auto lhsMember = dyn_cast<MemberPointerType>(lhsType))
+ {
+ auto rhsMember = dyn_cast<MemberPointerType>(rhsType);
+ if (!rhsMember)
+ return false;
+ if (lhsMember->getClass() != rhsMember->getClass())
+ return true;
+ return areTypesEqual(lhsMember->getPointeeType(), rhsMember->getPointeeType());
+ }
+ if (auto lhsParen = dyn_cast<ParenType>(lhsType))
+ {
+ auto rhsParen = dyn_cast<ParenType>(rhsType);
+ if (!rhsParen)
+ return false;
+ return areTypesEqual(lhsParen->getInnerType(), rhsParen->getInnerType());
+ }
+ if (dyn_cast<FunctionProtoType>(lhsType))
+ {
+ auto rhsFunction = dyn_cast<FunctionProtoType>(rhsType);
+ if (!rhsFunction)
+ return false;
+ return true; // TODO
+ }
+ if (auto lhsDecayed = dyn_cast<DecayedType>(lhsType))
+ {
+ auto rhsDecayed = dyn_cast<DecayedType>(rhsType);
+ if (!rhsDecayed)
+ return false;
+ return areTypesEqual(lhsDecayed->getAdjustedType(), rhsDecayed->getAdjustedType());
+ }
+ return lhsType == rhsType;
+}
+
+loplugin::Plugin::Registration<TypedefParam> X("typedefparam", true);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 422451c3e319..c7721c16ac57 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -88,7 +88,7 @@ private:
virtual sal_Bool SAL_CALL hasPendingChanges() override
{ return getRoot()->hasPendingChanges(); }
- virtual css::util::ChangesSet SAL_CALL getPendingChanges() override
+ virtual css::uno::Sequence< ::css::util::ElementChange > SAL_CALL getPendingChanges() override
{ return getRoot()->getPendingChanges(); }
css::beans::Property SAL_CALL getPropertyByHierarchicalName(
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 8b707bbe87d1..25673975a9e6 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -180,7 +180,7 @@ sal_Bool RootAccess::hasPendingChanges() {
return !changes.empty();
}
-css::util::ChangesSet RootAccess::getPendingChanges()
+css::uno::Sequence< ::css::util::ElementChange > RootAccess::getPendingChanges()
{
assert(thisIs(IS_UPDATE));
osl::MutexGuard g(*lock_);
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 9564bbf34a63..389cc9ad62b1 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -90,7 +90,7 @@ public:
virtual sal_Bool SAL_CALL hasPendingChanges() override;
- virtual css::util::ChangesSet SAL_CALL getPendingChanges() override;
+ virtual css::uno::Sequence< ::css::util::ElementChange > SAL_CALL getPendingChanges() override;
private:
virtual ~RootAccess() override;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
index cccbb294e204..0e52e9281f4b 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
@@ -60,7 +60,6 @@ namespace mysqlc
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::sdbc::SQLWarning;
using ::com::sun::star::uno::RuntimeException;
-typedef css::uno::Reference<css::container::XNameAccess> my_XNameAccessRef;
typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection, css::sdbc::XWarningsSupplier,
css::lang::XServiceInfo>
@@ -161,9 +160,10 @@ public:
sal_Int32 SAL_CALL getTransactionIsolation() override;
- my_XNameAccessRef SAL_CALL getTypeMap() override;
+ css::uno::Reference<css::container::XNameAccess> SAL_CALL getTypeMap() override;
- void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap) override;
+ void SAL_CALL
+ setTypeMap(const css::uno::Reference<css::container::XNameAccess>& typeMap) override;
// XCloseable
void SAL_CALL close() override;
// XWarningsSupplier
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
index 647d872c50d8..89e302eb08c7 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
@@ -167,7 +167,8 @@ public:
css::uno::Reference<css::io::XInputStream>
SAL_CALL getCharacterStream(sal_Int32 column) override;
- Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) override;
+ Any SAL_CALL getObject(
+ sal_Int32 column, const css::uno::Reference<css::container::XNameAccess>& typeMap) override;
css::uno::Reference<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) override;
css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) override;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
index e87a4efef73e..027cc294c153 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
@@ -199,7 +199,8 @@ public:
css::uno::Reference<css::io::XInputStream>
SAL_CALL getCharacterStream(sal_Int32 column) override;
- Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) override;
+ Any SAL_CALL getObject(
+ sal_Int32 column, const css::uno::Reference<css::container::XNameAccess>& typeMap) override;
css::uno::Reference<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) override;
css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) override;
diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx
index 2e5891982b8e..ba4e72833f4a 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -31,7 +31,7 @@ namespace cppu {
sal_Bool component_writeInfoHelper(
SAL_UNUSED_PARAMETER void *, void * pRegistryKey,
- ImplementationEntry const * entries)
+ const struct ImplementationEntry entries[])
{
bool bRet = false;
try
@@ -61,8 +61,8 @@ sal_Bool component_writeInfoHelper(
void * component_getFactoryHelper(
- char const * pImplName, SAL_UNUSED_PARAMETER void *,
- SAL_UNUSED_PARAMETER void *, ImplementationEntry const * entries)
+ sal_Char const * pImplName, SAL_UNUSED_PARAMETER void *,
+ SAL_UNUSED_PARAMETER void *, const struct ImplementationEntry entries[])
{
void * pRet = nullptr;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 30f5cd6980e7..6f63cb7d45b8 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -101,7 +101,7 @@ namespace svx
const OUString& getSecondaryText() const { return m_sSecondaryText; }
public:
- void Paint( OutputDevice& _rDevice, const ::tools::Rectangle& _rRect, DrawTextFlags _nTextStyle,
+ void Paint( vcl::RenderContext& _rDevice, const ::tools::Rectangle& _rRect, DrawTextFlags _nTextStyle,
::tools::Rectangle* _pPrimaryLocation, ::tools::Rectangle* _pSecondaryLocation );
};
diff --git a/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx b/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx
index 89371c735c44..ec5572667dea 100644
--- a/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx
+++ b/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx
@@ -48,7 +48,7 @@ void HsqlBinaryNode::readChildren(HsqlRowInputStream const& input)
}
std::vector<css::uno::Any> HsqlBinaryNode::readRow(HsqlRowInputStream& input,
- const ColumnTypeVector& aColTypes,
+ const std::vector<ColumnDefinition>& aColTypes,
sal_Int32 nIndexCount)
{
// skip first 4 bytes (size), and index nodes, 16 bytes each
diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.cxx b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
index b29889c1b6cd..dc5b51cc07ce 100644
--- a/dbaccess/source/filter/hsqldb/hsqlimport.cxx
+++ b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
@@ -48,12 +48,8 @@ using namespace css::io;
using namespace css::uno;
using namespace css::sdbc;
-using ColumnTypeVector = std::vector<dbahsql::ColumnDefinition>;
-using RowVector = std::vector<Any>;
-using IndexVector = std::vector<sal_Int32>;
-
-void lcl_setParams(const RowVector& row, Reference<XParameters> const& xParam,
- const ColumnTypeVector& rColTypes)
+void lcl_setParams(const std::vector<Any>& row, Reference<XParameters> const& xParam,
+ const std::vector<dbahsql::ColumnDefinition>& rColTypes)
{
assert(row.size() == rColTypes.size());
size_t nColIndex = 0;
@@ -182,7 +178,8 @@ void lcl_setParams(const RowVector& row, Reference<XParameters> const& xParam,
}
}
-OUString lcl_createInsertStatement(const OUString& sTableName, const ColumnTypeVector& rColTypes)
+OUString lcl_createInsertStatement(const OUString& sTableName,
+ const std::vector<dbahsql::ColumnDefinition>& rColTypes)
{
assert(rColTypes.size() > 0);
OUStringBuffer sql("INSERT INTO ");
@@ -221,8 +218,8 @@ HsqlImporter::HsqlImporter(Reference<XConnection>& rConnection, const Reference<
m_xStorage.set(rStorage);
}
-void HsqlImporter::insertRow(const RowVector& xRows, const OUString& sTableName,
- const ColumnTypeVector& rColTypes)
+void HsqlImporter::insertRow(const std::vector<css::uno::Any>& xRows, const OUString& sTableName,
+ const std::vector<ColumnDefinition>& rColTypes)
{
OUString sStatement = lcl_createInsertStatement(sTableName, rColTypes);
Reference<XPreparedStatement> xStatement = m_rConnection->prepareStatement(sStatement);
@@ -236,8 +233,8 @@ void HsqlImporter::insertRow(const RowVector& xRows, const OUString& sTableName,
}
void HsqlImporter::processTree(HsqlBinaryNode& rNode, HsqlRowInputStream& rStream,
- const ColumnTypeVector& rColTypes, const OUString& sTableName,
- sal_Int32 nIndexCount)
+ const std::vector<ColumnDefinition>& rColTypes,
+ const OUString& sTableName, sal_Int32 nIndexCount)
{
rNode.readChildren(rStream);
sal_Int32 nNext = rNode.getLeft();
@@ -267,7 +264,7 @@ void HsqlImporter::processTree(HsqlBinaryNode& rNode, HsqlRowInputStream& rStrea
* Balance: ?
* Left/Right/Parent: File position of the Left/Right/Parent child
*/
-void HsqlImporter::parseTableRows(const IndexVector& rIndexes,
+void HsqlImporter::parseTableRows(const std::vector<sal_Int32>& rIndexes,
const std::vector<ColumnDefinition>& rColTypes,
const OUString& sTableName)
{
diff --git a/dbaccess/source/filter/hsqldb/parseschema.cxx b/dbaccess/source/filter/hsqldb/parseschema.cxx
index e04998c80f28..be08037b7be5 100644
--- a/dbaccess/source/filter/hsqldb/parseschema.cxx
+++ b/dbaccess/source/filter/hsqldb/parseschema.cxx
@@ -167,7 +167,7 @@ void SchemaParser::parseSchema()
}
}
-ColumnTypeVector SchemaParser::getTableColumnTypes(const OUString& sTableName) const
+std::vector<ColumnDefinition> SchemaParser::getTableColumnTypes(const OUString& sTableName) const
{
return m_ColumnTypes.at(sTableName);
}
diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
index 5a447cacb4f3..24448f627971 100644
--- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
+++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
@@ -134,8 +134,6 @@ using namespace css::io;
using namespace boost::posix_time;
using namespace boost::gregorian;
-typedef std::vector<ColumnDefinition> ColumnTypeVector;
-
HsqlRowInputStream::HsqlRowInputStream() {}
void HsqlRowInputStream::setInputStream(Reference<XInputStream> const& rStream)
@@ -239,7 +237,7 @@ bool HsqlRowInputStream::checkNull()
return nNull == 0;
}
-std::vector<Any> HsqlRowInputStream::readOneRow(const ColumnTypeVector& nColTypes)
+std::vector<Any> HsqlRowInputStream::readOneRow(const std::vector<ColumnDefinition>& nColTypes)
{
auto nLen = nColTypes.size();
std::vector<Any> aData;
diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx
index e068c18f98ef..9404d777cea5 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -86,7 +86,7 @@ namespace dbaui
{
}
- CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper_Base& _rBase, const OUString& _rDisplayName)
+ CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const OUString& _rDisplayName)
:CharsetDisplayDerefHelper_Base(_rBase)
,m_sDisplayName(_rDisplayName)
{
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index d9fac66c63dd..9646add14cf6 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -80,7 +80,7 @@ namespace drawinglayer
{
}
- Primitive2DSequence SAL_CALL BasePrimitive2D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters )
+ css::uno::Sequence< ::css::uno::Reference< ::css::graphic::XPrimitive2D > > SAL_CALL BasePrimitive2D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters )
{
const geometry::ViewInformation2D aViewInformation(rViewParameters);
Primitive2DContainer aContainer;
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index cfac964e1a3a..828e4fdcf14c 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -54,7 +54,7 @@ namespace drawinglayer
return Primitive3DContainer();
}
- Primitive3DSequence SAL_CALL BasePrimitive3D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters )
+ css::uno::Sequence< ::css::uno::Reference< ::css::graphic::XPrimitive3D > > SAL_CALL BasePrimitive3D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters )
{
const geometry::ViewInformation3D aViewInformation(rViewParameters);
return comphelper::containerToSequence(get3DDecomposition(aViewInformation));
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index aae91634d45c..15cd2bdf6eba 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -99,7 +99,7 @@ public:
css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL
queryMeanings( const OUString& rTerm,
const css::lang::Locale& rLocale,
- const css::beans::PropertyValues& rProperties ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
};
@@ -175,7 +175,7 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
ThesDummy_Impl::queryMeanings(
const OUString& rTerm,
const lang::Locale& rLocale,
- const beans::PropertyValues& rProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties )
{
GetThes_Impl();
uno::Sequence< uno::Reference< linguistic2::XMeaning > > aRes;
@@ -207,10 +207,10 @@ public:
// XSpellChecker1 (same as XSpellChecker but sal_Int16 for language)
virtual sal_Bool SAL_CALL
isValid( const OUString& rWord, sal_Int16 nLanguage,
- const css::beans::PropertyValues& rProperties ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL
spell( const OUString& rWord, sal_Int16 nLanguage,
- const css::beans::PropertyValues& rProperties ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
};
@@ -248,7 +248,7 @@ sal_Bool SAL_CALL
sal_Bool SAL_CALL
SpellDummy_Impl::isValid( const OUString& rWord, sal_Int16 nLanguage,
- const beans::PropertyValues& rProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties )
{
GetSpell_Impl();
bool bRes = true;
@@ -260,7 +260,7 @@ sal_Bool SAL_CALL
uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL
SpellDummy_Impl::spell( const OUString& rWord, sal_Int16 nLanguage,
- const beans::PropertyValues& rProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties )
{
GetSpell_Impl();
uno::Reference< linguistic2::XSpellAlternatives > xRes;
@@ -295,19 +295,19 @@ public:
hyphenate( const OUString& rWord,
const css::lang::Locale& rLocale,
sal_Int16 nMaxLeading,
- const css::beans::PropertyValues& rProperties ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
virtual css::uno::Reference<
css::linguistic2::XHyphenatedWord > SAL_CALL
queryAlternativeSpelling( const OUString& rWord,
const css::lang::Locale& rLocale,
sal_Int16 nIndex,
- const css::beans::PropertyValues& rProperties ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
virtual css::uno::Reference<
css::linguistic2::XPossibleHyphens > SAL_CALL
createPossibleHyphens(
const OUString& rWord,
const css::lang::Locale& rLocale,
- const css::beans::PropertyValues& rProperties ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
};
@@ -348,7 +348,7 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL
const OUString& rWord,
const lang::Locale& rLocale,
sal_Int16 nMaxLeading,
- const beans::PropertyValues& rProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties )
{
GetHyph_Impl();
uno::Reference< linguistic2::XHyphenatedWord > xRes;
@@ -363,7 +363,7 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL
const OUString& rWord,
const lang::Locale& rLocale,
sal_Int16 nIndex,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties )
{
GetHyph_Impl();
uno::Reference< linguistic2::XHyphenatedWord > xRes;
@@ -377,7 +377,7 @@ uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL
HyphDummy_Impl::createPossibleHyphens(
const OUString& rWord,
const lang::Locale& rLocale,
- const beans::PropertyValues& rProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties )
{
GetHyph_Impl();
uno::Reference< linguistic2::XPossibleHyphens > xRes;
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 47347b9dc087..e5db22177383 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -33,8 +33,8 @@ namespace frm
class IFeatureDispatcher;
class ICommandImageProvider;
class ICommandDescriptionProvider;
-
class ImplNavToolBar;
+ typedef std::shared_ptr< const ICommandImageProvider > PCommandImageProvider;
class NavigationToolBar final : public vcl::Window
{
@@ -66,7 +66,7 @@ namespace frm
NavigationToolBar(
vcl::Window* _pParent,
WinBits _nStyle,
- const std::shared_ptr< const ICommandImageProvider >& _pImageProvider,
+ const PCommandImageProvider& _pImageProvider,
const OUString & sModuleId
);
virtual ~NavigationToolBar( ) override;
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 4028996e41c3..d881d0ec1d56 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -507,13 +507,13 @@ css::uno::Reference<css::xml::dom::XDocument> SAL_CALL Model::getDefaultInstance
// bindings management
-Model::XPropertySet_t SAL_CALL Model::createBinding()
+css::uno::Reference<css::beans::XPropertySet> SAL_CALL Model::createBinding()
{
DBG_INVARIANT();
return new Binding();
}
-Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding )
+css::uno::Reference<css::beans::XPropertySet> Model::cloneBinding( const css::uno::Reference<css::beans::XPropertySet>& xBinding )
{
DBG_INVARIANT();
XPropertySet_t xNewBinding = createBinding();
@@ -521,7 +521,7 @@ Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding )
return xNewBinding;
}
-Model::XPropertySet_t Model::getBinding( const OUString& sId )
+css::uno::Reference<css::beans::XPropertySet> Model::getBinding( const OUString& sId )
{
DBG_INVARIANT();
return mxBindings->hasItem( sId ) ? mxBindings->getItem( sId ) : nullptr;
@@ -543,7 +543,7 @@ css::uno::Reference<css::xforms::XSubmission> Model::createSubmission()
return new Submission();
}
-css::uno::Reference<css::xforms::XSubmission> Model::cloneSubmission(const XPropertySet_t& xSubmission)
+css::uno::Reference<css::xforms::XSubmission> Model::cloneSubmission(const css::uno::Reference<css::beans::XPropertySet>& xSubmission)
{
DBG_INVARIANT();
css::uno::Reference<css::xforms::XSubmission> xNewSubmission = createSubmission();
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index df08dee8ab48..6d956576778c 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -214,11 +214,11 @@ public:
// XModel: binding management
- virtual XPropertySet_t SAL_CALL createBinding() override;
+ virtual css::uno::Reference<css::beans::XPropertySet> SAL_CALL createBinding() override;
- virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& ) override;
+ virtual css::uno::Reference<css::beans::XPropertySet> SAL_CALL cloneBinding( const css::uno::Reference<css::beans::XPropertySet>& ) override;
- virtual XPropertySet_t SAL_CALL getBinding( const OUString& ) override;
+ virtual css::uno::Reference<css::beans::XPropertySet> SAL_CALL getBinding( const OUString& ) override;
virtual css::uno::Reference<css::container::XSet> SAL_CALL getBindings() override;
@@ -227,7 +227,7 @@ public:
virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL createSubmission() override;
- virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL cloneSubmission( const XPropertySet_t& ) override;
+ virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL cloneSubmission( const css::uno::Reference<css::beans::XPropertySet>& ) override;
virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL getSubmission( const OUString& ) override;
@@ -263,10 +263,10 @@ public:
/// determine a reasonable control service for a given node
/// (based on data type MIP assigned to the node)
- virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) override;
+ virtual OUString SAL_CALL getDefaultServiceNameForNode( const css::uno::Reference<css::xml::dom::XNode>& xNode ) override;
/// call getDefaultBindingExpressionForNode with default evaluation context
- virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) override;
+ virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const css::uno::Reference<css::xml::dom::XNode>& xNode ) override;
/// determine a reasonable default binding expression for a given node
/// and a given evaluation context
@@ -275,20 +275,20 @@ public:
const XNode_t&,
const EvaluationContext& );
- virtual OUString SAL_CALL getNodeDisplayName( const XNode_t&,
+ virtual OUString SAL_CALL getNodeDisplayName( const css::uno::Reference<css::xml::dom::XNode>&,
sal_Bool bDetail ) override;
- virtual OUString SAL_CALL getNodeName( const XNode_t& ) override;
+ virtual OUString SAL_CALL getNodeName( const css::uno::Reference<css::xml::dom::XNode>& ) override;
- virtual OUString SAL_CALL getBindingName( const XPropertySet_t&,
+ virtual OUString SAL_CALL getBindingName( const css::uno::Reference< ::css::beans::XPropertySet >&,
sal_Bool bDetail ) override;
- virtual OUString SAL_CALL getSubmissionName( const XPropertySet_t&,
+ virtual OUString SAL_CALL getSubmissionName( const css::uno::Reference< ::css::beans::XPropertySet >&,
sal_Bool bDetail ) override;
- virtual XPropertySet_t SAL_CALL cloneBindingAsGhost( const XPropertySet_t& ) override;
+ virtual css::uno::Reference< ::css::beans::XPropertySet > SAL_CALL cloneBindingAsGhost( const css::uno::Reference< ::css::beans::XPropertySet >& ) override;
- virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& ) override;
+ virtual void SAL_CALL removeBindingIfUseless( const css::uno::Reference< ::css::beans::XPropertySet >& ) override;
virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL newInstance( const OUString& sName,
const OUString& sURL,
@@ -312,22 +312,26 @@ public:
const OUString& sName ) override;
- virtual XNode_t SAL_CALL createElement( const XNode_t& xParent,
+ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL createElement(
+ const css::uno::Reference< ::css::xml::dom::XNode >& xParent,
const OUString& sName ) override;
- virtual XNode_t SAL_CALL createAttribute( const XNode_t& xParent,
+ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL createAttribute(
+ const css::uno::Reference< ::css::xml::dom::XNode >& xParent,
const OUString& sName ) override;
- virtual XNode_t SAL_CALL renameNode( const XNode_t& xNode,
+ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL renameNode(
+ const css::uno::Reference< ::css::xml::dom::XNode >& xNode,
const OUString& sName ) override;
- virtual XPropertySet_t SAL_CALL getBindingForNode( const XNode_t&,
- sal_Bool bCreate ) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getBindingForNode( const
+ css::uno::Reference<css::xml::dom::XNode>&,
+ sal_Bool bCreate ) override;
- virtual void SAL_CALL removeBindingForNode( const XNode_t& ) override;
+ virtual void SAL_CALL removeBindingForNode( const css::uno::Reference< ::css::xml::dom::XNode >& ) override;
virtual OUString SAL_CALL getResultForExpression(
- const XPropertySet_t& xBinding,
+ const css::uno::Reference< css::beans::XPropertySet >& xBinding,
sal_Bool bIsBindingExpression,
const OUString& sExpression ) override;
@@ -336,7 +340,7 @@ public:
virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName ) override;
virtual void SAL_CALL setNodeValue(
- const XNode_t& xNode,
+ const css::uno::Reference< ::css::xml::dom::XNode >& xNode,
const OUString& sValue ) override;
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 93bd72f06951..521f710fbc50 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -67,7 +67,7 @@ using namespace com::sun::star::xml::xpath;
// implement XFormsUIHelper1
-OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode )
+OUString Model::getDefaultServiceNameForNode( const css::uno::Reference<css::xml::dom::XNode>& xNode )
{
// determine service for control. string/text field is default.
OUString sService = "com.sun.star.form.component.TextField";
@@ -248,7 +248,7 @@ OUString Model::getDefaultBindingExpressionForNode(
}
-OUString Model::getDefaultBindingExpressionForNode( const XNode_t& xNode )
+OUString Model::getDefaultBindingExpressionForNode( const css::uno::Reference<css::xml::dom::XNode>& xNode )
{
return getDefaultBindingExpressionForNode( xNode, getEvaluationContext() );
}
@@ -270,7 +270,7 @@ static bool lcl_isWhitespace( const OUString& rString )
return bWhitespace;
}
-OUString Model::getNodeDisplayName( const XNode_t& xNode,
+OUString Model::getNodeDisplayName( const css::uno::Reference<css::xml::dom::XNode>& xNode,
sal_Bool bDetail )
{
OUStringBuffer aBuffer;
@@ -312,7 +312,7 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode,
return aBuffer.makeStringAndClear();
}
-OUString Model::getNodeName( const XNode_t& xNode )
+OUString Model::getNodeName( const css::uno::Reference<css::xml::dom::XNode>& xNode )
{
OUStringBuffer aBuffer;
@@ -334,7 +334,7 @@ OUString Model::getNodeName( const XNode_t& xNode )
return aBuffer.makeStringAndClear();
}
-OUString Model::getBindingName( const XPropertySet_t& xBinding,
+OUString Model::getBindingName( const css::uno::Reference< ::css::beans::XPropertySet >& xBinding,
sal_Bool /*bDetail*/ )
{
OUString sID;
@@ -353,7 +353,7 @@ OUString Model::getBindingName( const XPropertySet_t& xBinding,
return sRet;
}
-OUString Model::getSubmissionName( const XPropertySet_t& xSubmission,
+OUString Model::getSubmissionName( const css::uno::Reference< ::css::beans::XPropertySet >& xSubmission,
sal_Bool /*bDetail*/ )
{
OUString sID;
@@ -361,7 +361,7 @@ OUString Model::getSubmissionName( const XPropertySet_t& xSubmission,
return sID;
}
-Model::XPropertySet_t Model::cloneBindingAsGhost( const XPropertySet_t &xBinding )
+css::uno::Reference< ::css::beans::XPropertySet > Model::cloneBindingAsGhost( const css::uno::Reference< ::css::beans::XPropertySet > &xBinding )
{
// Create a new binding instance first...
Binding *pBinding = new Binding();
@@ -377,7 +377,7 @@ Model::XPropertySet_t Model::cloneBindingAsGhost( const XPropertySet_t &xBinding
return xNewBinding;
}
-void Model::removeBindingIfUseless( const XPropertySet_t& xBinding )
+void Model::removeBindingIfUseless( const css::uno::Reference< ::css::beans::XPropertySet >& xBinding )
{
Binding* pBinding = Binding::getBinding( xBinding );
if( pBinding != nullptr )
@@ -542,7 +542,7 @@ void Model::removeModel( const Reference<css::frame::XModel>& xCmp,
}
}
-Model::XNode_t Model::createElement( const XNode_t& xParent,
+css::uno::Reference<css::xml::dom::XNode> Model::createElement( const css::uno::Reference<css::xml::dom::XNode>& xParent,
const OUString& sName )
{
Reference<XNode> xNode;
@@ -556,7 +556,7 @@ Model::XNode_t Model::createElement( const XNode_t& xParent,
return xNode;
}
-Model::XNode_t Model::createAttribute( const XNode_t& xParent,
+css::uno::Reference<css::xml::dom::XNode> Model::createAttribute( const css::uno::Reference<css::xml::dom::XNode>& xParent,
const OUString& sName )
{
Reference<XNode> xNode;
@@ -581,7 +581,7 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent,
return xNode;
}
-Model::XNode_t Model::renameNode( const XNode_t& xNode,
+css::uno::Reference<css::xml::dom::XNode> Model::renameNode( const css::uno::Reference<css::xml::dom::XNode>& xNode,
const OUString& sName )
{
// early out if we don't have to change the name
@@ -664,7 +664,7 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode,
return xNew.is() ? xNew : xNode;
}
-Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode,
+css::uno::Reference< ::css::beans::XPropertySet > Model::getBindingForNode( const css::uno::Reference<css::xml::dom::XNode>& xNode,
sal_Bool bCreate )
{
OSL_ENSURE( xNode.is(), "no node?" );
@@ -720,7 +720,7 @@ Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode,
return pBestBinding;
}
-void Model::removeBindingForNode( const XNode_t& )
+void Model::removeBindingForNode( const css::uno::Reference<css::xml::dom::XNode>& )
{
// determine whether suitable binding is still used
}
@@ -857,7 +857,7 @@ static OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult
}
OUString Model::getResultForExpression(
- const XPropertySet_t& xBinding,
+ const css::uno::Reference< ::css::beans::XPropertySet >& xBinding,
sal_Bool bIsBindingExpression,
const OUString& sExpression )
{
@@ -901,7 +901,7 @@ sal_Bool Model::isValidPrefixName( const OUString& sName )
}
void Model::setNodeValue(
- const XNode_t& xNode,
+ const css::uno::Reference< ::css::xml::dom::XNode >& xNode,
const OUString& sValue )
{
setSimpleContent( xNode, sValue );
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index f601c8a78187..f67a4e777a96 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -1206,7 +1206,7 @@ hchar_string hstr2ucsstr(hchar const* hstr)
* Convert strings of kchar type, which can contain Korean, English and others
* to strings of hchar type of Hangul Word Processor
*/
-hchar_string kstr2hstr(unsigned char const* src)
+hchar_string kstr2hstr(uchar const* src)
{
hchar_string ret;
if (!src)
diff --git a/include/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx
index 3115fe5d3f84..093f1a32e392 100644
--- a/include/canvas/spriteredrawmanager.hxx
+++ b/include/canvas/spriteredrawmanager.hxx
@@ -24,6 +24,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2drectangle.hxx>
#include <vector>
#include <algorithm>
@@ -359,8 +360,8 @@ namespace canvas
bool areSpritesChanged( const UpdateArea& rUpdateArea ) const;
- bool isAreaUpdateNotOpaque( const ::basegfx::B2DRange& rUpdateRect,
- const AreaComponent& rComponent ) const;
+ bool isAreaUpdateNotOpaque( const ::basegfx::B2DRectangle& rUpdateRect,
+ const AreaComponent& rComponent ) const;
bool isAreaUpdateOpaque( const UpdateArea& rUpdateArea,
::std::size_t nNumSprites ) const;
@@ -378,8 +379,8 @@ namespace canvas
@param rUpdateArea
Area to check for scroll update optimization
*/
- bool isAreaUpdateScroll( ::basegfx::B2DRange& o_rMoveStart,
- ::basegfx::B2DRange& o_rMoveEnd,
+ bool isAreaUpdateScroll( ::basegfx::B2DRectangle& o_rMoveStart,
+ ::basegfx::B2DRectangle& o_rMoveEnd,
const UpdateArea& rUpdateArea,
::std::size_t nNumSprites ) const;
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index cadb85297d8f..a92ea7ecd04b 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -216,14 +216,10 @@ namespace comphelper
/** is a specialization of OListenerContainer which saves you some additional type casts,
by making the required listener and event types template arguments.
*/
- template< class LISTENER, class EVENT >
+ template< class ListenerClass, class EventClass >
class OListenerContainerBase : public OListenerContainer
{
public:
- typedef LISTENER ListenerClass;
- typedef EVENT EventClass;
-
- public:
OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex )
{
}
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 8e75a0a0fc57..c06065117b75 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -211,7 +211,7 @@ namespace drawinglayer
/** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It
will construct a ViewInformation2D from the ViewParameters for that purpose
*/
- virtual Primitive2DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
+ virtual css::uno::Sequence< ::css::uno::Reference< ::css::graphic::XPrimitive2D > > SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
/** The getRange implementation for UNO API will use getRange from this implementation. It
will construct a ViewInformation2D from the ViewParameters for that purpose
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index e447004277a8..dc419df482cb 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -133,7 +133,7 @@ namespace drawinglayer
/** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It
will get the ViewInformation from the ViewParameters for that purpose
*/
- virtual Primitive3DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
+ virtual css::uno::Sequence< ::css::uno::Reference< ::css::graphic::XPrimitive3D > > SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
/** the getRange default implementation will use getDecomposition to create the range information from merging
getRange results from the single local decomposition primitives.
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 9355b7881788..4d4c4d3cf4f8 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -96,7 +96,7 @@ public:
bool isNotesPage() const { return mbNotes; }
void setLayoutValueToken( sal_Int32 nLayoutValueToken ) { mnLayoutValueToken = nLayoutValueToken; }
- short getLayoutFromValueToken();
+ sal_Int16 getLayoutFromValueToken();
const oox::drawingml::TextListStylePtr& getDefaultTextStyle() const { return maDefaultTextStylePtr; }
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index d7741b76e8c0..1f834835602a 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -130,7 +130,7 @@ public:
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL ,
const OUString & sTargetFrameName,
- FrameSearchFlags eSearchFlags ) override ;
+ sal_Int32 eSearchFlags ) override ;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) override ;
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 068fe89399c4..6022cb1c8142 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -331,7 +331,7 @@ protected:
virtual bool SeekRow( long nRow ) = 0;
void DrawCursor();
void PaintData(vcl::Window const & rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
- virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
+ virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
// Advice for the subclass: the visible scope of rows has changed.
// The subclass is able to announce changes of the model with the
// help of the methods RowInserted and RowRemoved. Because of the
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 01f1298f0ff3..12c754db95ae 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -622,7 +622,7 @@ namespace svt
void implCreateActiveAccessible( );
private:
- virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect,
+ virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect,
sal_uInt16 nColumnId ) const override;
using Control::ImplInitSettings;
SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index ff738c6de623..4e0933686065 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -32,6 +32,9 @@ namespace vcl { class Window; }
class OutputDevice;
class StyleSettings;
+namespace vcl {
+ typedef OutputDevice RenderContext;
+};
namespace svt { namespace table
@@ -89,7 +92,7 @@ namespace svt { namespace table
the style to be used for drawing
*/
virtual void PaintHeaderArea(
- OutputDevice& _rDevice, const tools::Rectangle& _rArea,
+ vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
bool _bIsColHeaderArea, bool _bIsRowHeaderArea,
const StyleSettings& _rStyle ) = 0;
@@ -108,7 +111,7 @@ namespace svt { namespace table
the style to be used for drawing
*/
virtual void PaintColumnHeader( ColPos _nCol, bool _bActive,
- OutputDevice& _rDevice, const tools::Rectangle& _rArea,
+ vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
const StyleSettings& _rStyle ) = 0;
/** prepares a row for painting
@@ -143,7 +146,7 @@ namespace svt { namespace table
the style to be used for drawing
*/
virtual void PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected,
- OutputDevice& _rDevice, const tools::Rectangle& _rRowArea,
+ vcl::RenderContext& _rDevice, const tools::Rectangle& _rRowArea,
const StyleSettings& _rStyle ) = 0;
/** paints the header of a row
@@ -172,7 +175,7 @@ namespace svt { namespace table
the style to be used for drawing
*/
virtual void PaintRowHeader( bool i_hasControlFocus, bool _bSelected,
- OutputDevice& _rDevice, tools::Rectangle const & _rArea,
+ vcl::RenderContext& _rDevice, tools::Rectangle const & _rArea,
StyleSettings const & _rStyle ) = 0;
/** paints a certain cell
@@ -203,7 +206,7 @@ namespace svt { namespace table
*/
virtual void PaintCell( ColPos const i_col,
bool i_hasControlFocus, bool _bSelected,
- OutputDevice& _rDevice, const tools::Rectangle& _rArea,
+ vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
const StyleSettings& _rStyle ) = 0;
/** draws a cell cursor in the given rectangle
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index b513f1ab593b..0551f2ad03c8 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -71,7 +71,7 @@ public:
virtual void RecalculateFont(vcl::RenderContext& rRenderContext);
- void SelectCharacter( sal_uInt32 cNew );
+ void SelectCharacter( sal_UCS4 cNew );
virtual sal_UCS4 GetSelectCharacter() const;
void createContextMenu();
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 575db968193b..3dba3d9a487d 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -140,7 +140,7 @@ private:
// BrowseBox
virtual bool SeekRow( long nRow ) override;
- virtual void PaintField( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override;
+ virtual void PaintField( vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override;
virtual void DoubleClick( const BrowserMouseEvent& rEvt ) override;
virtual void Select() override;
virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override;
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 9407c7eed60f..e43279e31e6c 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SVX_SDRPAGEWINDOW_HXX
#define INCLUDED_SVX_SDRPAGEWINDOW_HXX
+#include <basegfx/range/b2irectangle.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <svx/svdtypes.hxx>
#include <svx/svxdllapi.h>
@@ -74,7 +75,7 @@ public:
void PrePaint();
void PrepareRedraw(const vcl::Region& rReg);
void RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector );
- void RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector, basegfx::B2IRange const*);
+ void RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector, basegfx::B2IRectangle const*);
// Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...)
void InvalidatePageWindow(const basegfx::B2DRange& rRange);
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index aa6c5b325688..ea376dc8c035 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -32,6 +32,7 @@
#include <memory>
#include <vector>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/b2irectangle.hxx>
namespace vcl { class Region; }
@@ -167,7 +168,7 @@ public:
void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr,
const tools::Rectangle& rRect = tools::Rectangle(),
- basegfx::B2IRange const* pPageFrame = nullptr);
+ basegfx::B2IRectangle const* pPageFrame = nullptr);
void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = COL_BLACK );
tools::Rectangle GetPageRect() const;
diff --git a/include/vcl/cairo.hxx b/include/vcl/cairo.hxx
index 7ca45efba74f..87d820ab81ff 100644
--- a/include/vcl/cairo.hxx
+++ b/include/vcl/cairo.hxx
@@ -33,6 +33,8 @@ namespace cairo {
typedef std::shared_ptr<cairo_surface_t> CairoSurfaceSharedPtr;
typedef std::shared_ptr<cairo_t> CairoSharedPtr;
+ struct Surface;
+ typedef std::shared_ptr<Surface> SurfaceSharedPtr;
/** Cairo surface interface
@@ -47,7 +49,7 @@ namespace cairo {
// Query methods
virtual CairoSharedPtr getCairo() const = 0;
virtual CairoSurfaceSharedPtr getCairoSurface() const = 0;
- virtual std::shared_ptr<Surface> getSimilar(int cairo_content_type, int width, int height) const = 0;
+ virtual SurfaceSharedPtr getSimilar(int cairo_content_type, int width, int height) const = 0;
/// factory for VirDev on this surface
virtual VclPtr<VirtualDevice> createVirtualDevice() const = 0;
@@ -60,7 +62,6 @@ namespace cairo {
virtual void flush() const = 0;
};
- typedef std::shared_ptr<Surface> SurfaceSharedPtr;
}
#endif
diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
index eeb8367ced6c..2a4e1dd08ff1 100644
--- a/include/vcl/fontcharmap.hxx
+++ b/include/vcl/fontcharmap.hxx
@@ -139,7 +139,7 @@ private:
friend class ::OutputDevice;
- int findRangeIndex( sal_uInt32 ) const;
+ int findRangeIndex( sal_UCS4 ) const;
FontCharMap( ImplFontCharMapRef const & pIFCMap );
@@ -153,9 +153,9 @@ class VCL_PLUGIN_PUBLIC CmapResult
{
public:
explicit CmapResult( bool bSymbolic = false,
- const sal_uInt32* pRangeCodes = nullptr, int nRangeCount = 0 );
+ const sal_UCS4* pRangeCodes = nullptr, int nRangeCount = 0 );
- const sal_uInt32* mpRangeCodes;
+ const sal_UCS4* mpRangeCodes;
const int* mpStartGlyphs;
const sal_uInt16* mpGlyphIds;
int mnRangeCount;
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index ebd9f179b90f..92107c94c136 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -265,7 +265,7 @@ bool LoadDictionary(HDInfo& rDict)
Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWord,
const css::lang::Locale& aLocale,
sal_Int16 nMaxLeading,
- const css::beans::PropertyValues& aProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& aProperties )
{
PropertyHelper_Hyphenation& rHelper = GetPropHelper();
rHelper.SetTmpPropVals(aProperties);
@@ -491,7 +491,7 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
const OUString& aWord,
const css::lang::Locale& aLocale,
sal_Int16 nIndex,
- const css::beans::PropertyValues& aProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& aProperties )
{
// Firstly we allow only one plus character before the hyphen to avoid to miss the right break point:
for (int extrachar = 1; extrachar <= 2; extrachar++)
@@ -505,7 +505,7 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord,
const css::lang::Locale& aLocale,
- const css::beans::PropertyValues& aProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& aProperties )
{
PropertyHelper_Hyphenation& rHelper = GetPropHelper();
rHelper.SetTmpPropVals(aProperties);
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index a5257dd84380..46cf4f4f84c6 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -90,9 +90,9 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override;
// XHyphenator
- virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) override;
- virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) override;
- virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override;
+ virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) override;
+ virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) override;
+ virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) override;
// XLinguServiceEventBroadcaster
virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override;
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 1f6c46a27a69..3462899714a2 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -380,7 +380,7 @@ sal_Int16 SpellChecker::GetSpellFailure(const OUString &rWord, const Locale &rLo
}
sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rLocale,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
@@ -505,7 +505,7 @@ Reference< XSpellAlternatives >
Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell(
const OUString& rWord, const Locale& rLocale,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 82ddbedf0af3..a500f1527897 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -93,8 +93,8 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override;
// XSpellChecker
- virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override;
- virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override;
+ virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
+ virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
// XLinguServiceEventBroadcaster
virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override;
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 1fae95a2a4db..88709304521d 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -237,7 +237,7 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale)
Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings(
const OUString& qTerm, const Locale& rLocale,
- const PropertyValues& rProperties)
+ const css::uno::Sequence< css::beans::PropertyValue >& rProperties)
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 34ad5ca092c9..394aefada281 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -101,7 +101,7 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override;
// XThesaurus
- virtual Sequence< Reference < css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) override;
+ virtual Sequence< Reference < css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
// XServiceDisplayName
virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override;
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 22643b3b9c04..b15ec9c15807 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -272,7 +272,7 @@ sal_Bool SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale)
Reference< XHyphenatedWord > SAL_CALL
HyphenatorDispatcher::hyphenate(
const OUString& rWord, const Locale& rLocale, sal_Int16 nMaxLeading,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< ::css::beans::PropertyValue >& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
@@ -408,7 +408,7 @@ Reference< XHyphenatedWord > SAL_CALL
Reference< XHyphenatedWord > SAL_CALL
HyphenatorDispatcher::queryAlternativeSpelling(
const OUString& rWord, const Locale& rLocale, sal_Int16 nIndex,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< ::css::beans::PropertyValue >& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
@@ -539,7 +539,7 @@ Reference< XHyphenatedWord > SAL_CALL
Reference< XPossibleHyphens > SAL_CALL
HyphenatorDispatcher::createPossibleHyphens(
const OUString& rWord, const Locale& rLocale,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< ::css::beans::PropertyValue >& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index ec8ec580570b..4825f745d8f4 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -91,18 +91,18 @@ public:
hyphenate( const OUString& aWord,
const css::lang::Locale& aLocale,
sal_Int16 nMaxLeading,
- const css::beans::PropertyValues& aProperties ) override;
+ const css::uno::Sequence< ::css::beans::PropertyValue >& aProperties ) override;
virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL
queryAlternativeSpelling( const OUString& aWord,
const css::lang::Locale& aLocale,
sal_Int16 nIndex,
- const css::beans::PropertyValues& aProperties ) override;
+ const css::uno::Sequence< ::css::beans::PropertyValue >& aProperties ) override;
virtual css::uno::Reference<
css::linguistic2::XPossibleHyphens > SAL_CALL
createPossibleHyphens(
const OUString& aWord,
const css::lang::Locale& aLocale,
- const css::beans::PropertyValues& aProperties ) override;
+ const css::uno::Sequence< ::css::beans::PropertyValue >& aProperties ) override;
// LinguDispatcher
virtual void
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index e557207ffdcc..3103d1c7ef1c 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -212,7 +212,7 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::hasLocale( const Locale& rLocale )
sal_Bool SAL_CALL
SpellCheckerDispatcher::isValid( const OUString& rWord, const Locale& rLocale,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< ::css::beans::PropertyValue >& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
return isValid_Impl( rWord, LinguLocaleToLanguage( rLocale ), rProperties );
@@ -221,7 +221,7 @@ sal_Bool SAL_CALL
Reference< XSpellAlternatives > SAL_CALL
SpellCheckerDispatcher::spell( const OUString& rWord, const Locale& rLocale,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< ::css::beans::PropertyValue >& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
return spell_Impl( rWord, LinguLocaleToLanguage( rLocale ), rProperties );
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 8e65841d2d9b..4c4dd7fd9c19 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -92,8 +92,8 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const css::lang::Locale& aLocale ) override;
// XSpellChecker
- virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override;
- virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override;
+ virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const css::lang::Locale& aLocale, const css::uno::Sequence< ::css::beans::PropertyValue >& aProperties ) override;
+ virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const css::lang::Locale& aLocale, const css::uno::Sequence< ::css::beans::PropertyValue >& aProperties ) override;
// XSupportedLanguages
virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) override;
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 2ca199e567db..3fdfe5c73da1 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -106,7 +106,7 @@ sal_Bool SAL_CALL
Sequence< Reference< XMeaning > > SAL_CALL
ThesaurusDispatcher::queryMeanings(
const OUString& rTerm, const Locale& rLocale,
- const PropertyValues& rProperties )
+ const css::uno::Sequence< ::css::beans::PropertyValue >& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index cf00a7897f3f..4481099e3a59 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -73,7 +73,7 @@ public:
virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL
queryMeanings( const OUString& aTerm,
const css::lang::Locale& aLocale,
- const css::beans::PropertyValues& aProperties ) override;
+ const css::uno::Sequence< ::css::beans::PropertyValue >& aProperties ) override;
// LinguDispatcher
virtual void
diff --git a/oox/source/mathml/import.cxx b/oox/source/mathml/import.cxx
index 8fb181996175..5a02f8906955 100644
--- a/oox/source/mathml/import.cxx
+++ b/oox/source/mathml/import.cxx
@@ -98,7 +98,7 @@ void SAL_CALL LazyMathBufferingContext::characters(OUString const& rChars)
} // namespace formulaimport
-core::ContextHandlerRef CreateLazyMathBufferingContext(
+rtl::Reference<core::ContextHandler> CreateLazyMathBufferingContext(
core::ContextHandler const& rParent, drawingml::TextParagraph & rPara)
{
return new formulaimport::LazyMathBufferingContext(rParent, rPara);
diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx
index 72c36f5eb9ab..3f7fda0c7099 100644
--- a/sal/osl/unx/mutex.cxx
+++ b/sal/osl/unx/mutex.cxx
@@ -69,7 +69,7 @@ oslMutex SAL_CALL osl_createMutex()
return pMutex;
}
-void SAL_CALL osl_destroyMutex(oslMutexImpl *pMutex)
+void SAL_CALL osl_destroyMutex(oslMutex pMutex)
{
SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
@@ -87,7 +87,7 @@ void SAL_CALL osl_destroyMutex(oslMutexImpl *pMutex)
}
}
-sal_Bool SAL_CALL osl_acquireMutex(oslMutexImpl *pMutex)
+sal_Bool SAL_CALL osl_acquireMutex(oslMutex pMutex)
{
SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
@@ -108,7 +108,7 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutexImpl *pMutex)
return false;
}
-sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutexImpl *pMutex)
+sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex pMutex)
{
bool result = false;
@@ -125,7 +125,7 @@ sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutexImpl *pMutex)
return result;
}
-sal_Bool SAL_CALL osl_releaseMutex(oslMutexImpl *pMutex)
+sal_Bool SAL_CALL osl_releaseMutex(oslMutex pMutex)
{
SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx
index 915f1e27237b..edbbec9c18dd 100644
--- a/sal/textenc/tencinfo.cxx
+++ b/sal/textenc/tencinfo.cxx
@@ -197,7 +197,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromWindowsCharset( sal_uInt8 nWinC
/* ----------------------------------------------------------------------- */
-rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixCharset )
+rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pUnixCharset )
{
/* See <ftp://ftp.x.org/pub/DOCS/registry>, section 14 ("Font Charset
* (Registry and Encoding) Names").
@@ -468,7 +468,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC
/* ----------------------------------------------------------------------- */
-rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const char* pMimeCharset )
+rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const sal_Char* pMimeCharset )
{
/* All Identifiers are in lower case and contain only alphanumeric */
/* characters. The function search for the first equal string in */
@@ -788,7 +788,7 @@ sal_uInt8 SAL_CALL rtl_getBestWindowsCharsetFromTextEncoding( rtl_TextEncoding e
/* ----------------------------------------------------------------------- */
-const char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
+const sal_Char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
{
const ImplTextEncodingData* pData = Impl_getTextEncodingData( eTextEncoding );
if ( pData )
@@ -808,7 +808,7 @@ char const * SAL_CALL rtl_getMimeCharsetFromTextEncoding(rtl_TextEncoding
p->mpBestMimeCharset : nullptr;
}
-const char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
+const sal_Char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
{
const ImplTextEncodingData* pData = Impl_getTextEncodingData( eTextEncoding );
if ( pData )
diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx
index 2d5add0a89e4..3ab1c9aea562 100644
--- a/sal/textenc/textcvt.cxx
+++ b/sal/textenc/textcvt.cxx
@@ -155,7 +155,7 @@ void SAL_CALL rtl_resetTextToUnicodeContext( rtl_TextToUnicodeConverter hConvert
sal_Size SAL_CALL rtl_convertTextToUnicode( rtl_TextToUnicodeConverter hConverter,
rtl_TextToUnicodeContext hContext,
- const char* pSrcBuf, sal_Size nSrcBytes,
+ const sal_Char* pSrcBuf, sal_Size nSrcBytes,
sal_Unicode* pDestBuf, sal_Size nDestChars,
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtBytes )
@@ -251,7 +251,7 @@ void SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConverter hConvert
sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverter,
rtl_UnicodeToTextContext hContext,
const sal_Unicode* pSrcBuf, sal_Size nSrcChars,
- char* pDestBuf, sal_Size nDestBytes,
+ sal_Char* pDestBuf, sal_Size nDestBytes,
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtChars )
{
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index a4c080663cc8..f6849e8abf5d 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -669,7 +669,7 @@ namespace sax_fastparser {
merge( maData, rWhat, false );
}
- void FastSaxSerializer::ForMerge::append( const Int8Sequence &rWhat )
+ void FastSaxSerializer::ForMerge::append( const css::uno::Sequence<sal_Int8> &rWhat )
{
merge( maData, rWhat, true );
}
@@ -722,7 +722,7 @@ namespace sax_fastparser {
append( rWhat );
}
- void FastSaxSerializer::ForSort::append( const Int8Sequence &rWhat )
+ void FastSaxSerializer::ForSort::append( const css::uno::Sequence<sal_Int8> &rWhat )
{
merge( maData[mnCurrentElement], rWhat, true );
}
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index f450580ff3e5..b00ccf0923df 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -185,7 +185,7 @@ private:
#endif
virtual void prepend( const Int8Sequence &rWhat );
- virtual void append( const Int8Sequence &rWhat ) override;
+ virtual void append( const css::uno::Sequence<sal_Int8> &rWhat ) override;
void postpone( const Int8Sequence &rWhat );
protected:
@@ -216,7 +216,7 @@ private:
#endif
virtual void prepend( const Int8Sequence &rWhat ) override;
- virtual void append( const Int8Sequence &rWhat ) override;
+ virtual void append( const css::uno::Sequence<sal_Int8> &rWhat ) override;
private:
void sort();
};
diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index 4c01deb06172..e7b35ea5dfd5 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -53,7 +53,7 @@ public:
void removeSegment(SCCOLROW nPos1, SCCOLROW nPos2);
void insertSegment(SCCOLROW nPos, SCCOLROW nSize, bool bSkipStartBoundary);
- SCROW findLastTrue(ValueType nValue) const;
+ SCCOLROW findLastTrue(ValueType nValue) const;
// range iteration
bool getFirst(RangeData& rData);
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 8abfeb098bdf..6be071381023 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1458,7 +1458,7 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm )
Authors::const_iterator aAuthorsBegin = aAuthors.begin();
for( size_t i = 0; i < nNotes; ++i )
{
- XclExpNoteList::RecordRefType xNote = mrNotes.GetRecord( i );
+ XclExpRecordList< XclExpNote >::RecordRefType xNote = mrNotes.GetRecord( i );
Authors::const_iterator aAuthor = aAuthors.find(
XclXmlUtils::ToOUString( xNote->GetAuthor() ) );
sal_Int32 nAuthorId = distance( aAuthorsBegin, aAuthor );
diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx
index 4fbbd12a9665..ee0253dbffac 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -94,9 +94,9 @@ private:
public:
LotusRangeList();
~LotusRangeList();
- inline sal_uInt16 GetIndex( SCCOL nCol, SCROW nRow );
- inline sal_uInt16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
- sal_uInt16 GetIndex( const LotusRange& );
+ inline LR_ID GetIndex( SCCOL nCol, SCROW nRow );
+ inline LR_ID GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
+ LR_ID GetIndex( const LotusRange& );
void Append( std::unique_ptr<LotusRange> pLR );
};
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index b7f09aeef717..7a9dbbda3f36 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -125,7 +125,7 @@ public:
/** Sets the VBA project storage used to import VBA source code and forms. */
void setVbaProjectStorage( const StorageRef& rxVbaPrjStrg );
/** Sets the index of the current Calc sheet, if filter currently processes a sheet. */
- void setCurrentSheetIndex( sal_Int16 nSheet );
+ void setCurrentSheetIndex( SCTAB nSheet );
/** Final conversion after importing the workbook. */
void finalizeWorkbookImport();
void useInternalChartDataTable( bool bInternal );
diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index af88892c02bb..8f135e05ea9c 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -175,7 +175,7 @@ public:
const WorkbookHelper& rHelper,
const ISegmentProgressBarRef& rxProgressBar,
WorksheetType eSheetType,
- sal_Int16 nSheet );
+ SCTAB nSheet );
// horrible accessor for hidden WorksheetGlobals ...
static IWorksheetProgress *getWorksheetInterface( const WorksheetGlobalsRef &xRef );
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 6d30de9b553e..f45ebbf79bcf 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -365,16 +365,13 @@ private:
class XclExpComments : public XclExpRecord
{
public:
- typedef XclExpRecordList< XclExpNote >
- XclExpNoteList;
-
- XclExpComments( SCTAB nTab, XclExpNoteList& rNotes );
+ XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes );
virtual void SaveXml( XclExpXmlStream& rStrm ) override;
private:
SCTAB const mnTab;
- XclExpNoteList& mrNotes;
+ XclExpRecordList< XclExpNote >& mrNotes;
};
// object manager =============================================================
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index d2c5de0997ce..331fb28bb9ee 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -267,7 +267,6 @@ typedef ::cppu::ImplHelper2<
class ScAccessibleCsvGrid : public ScAccessibleCsvControl, public ScAccessibleCsvGridImpl
{
protected:
- typedef css::uno::Reference< css::accessibility::XAccessibleTable > XAccessibleTableRef;
typedef std::map< sal_Int32, rtl::Reference<ScAccessibleCsvControl> > XAccessibleSet;
private:
@@ -325,10 +324,10 @@ public:
virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
/** Returns the row headers as an AccessibleTable. */
- virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders() override;
/** Returns the column headers as an AccessibleTable. */
- virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders() override;
/** Returns the selected rows as a sequence. */
virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() override;
diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx
index fe5e0e24d75a..d231dda5f08a 100644
--- a/sc/source/ui/inc/colrowba.hxx
+++ b/sc/source/ui/inc/colrowba.hxx
@@ -73,7 +73,7 @@ public:
virtual OUString GetEntryText( SCCOLROW nEntryNo ) const override;
virtual bool IsMirrored() const override;
- virtual SCROW GetHiddenCount( SCROW nEntryNo ) const override;
+ virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ) const override;
virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) override;
virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) override;
diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx
index bf0319b5f530..0c7fc699ab00 100644
--- a/sc/source/ui/inc/condformatuno.hxx
+++ b/sc/source/ui/inc/condformatuno.hxx
@@ -203,9 +203,9 @@ public:
virtual ~ScColorScaleEntryObj() override;
- virtual css::util::Color SAL_CALL getColor() override;
+ virtual sal_Int32 SAL_CALL getColor() override;
- virtual void SAL_CALL setColor(css::util::Color aColor) override;
+ virtual void SAL_CALL setColor(sal_Int32 aColor) override;
virtual sal_Int32 SAL_CALL getType() override;
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 0dd142b4e92f..7e807d9a5ad0 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -116,7 +116,7 @@ public:
static sal_uInt16 DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts );
- void OnLOKShowHideColRow(bool bColumns, SCROW nStartRow);
+ void OnLOKShowHideColRow(bool bColumns, SCCOLROW nStartRow);
};
#endif
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index 4685fd0387c4..69dd2b708453 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -1011,13 +1011,13 @@ ScColorScaleEntry* ScColorScaleEntryObj::getCoreObject()
return pFormat->GetEntry(mnPos);
}
-util::Color ScColorScaleEntryObj::getColor()
+sal_Int32 ScColorScaleEntryObj::getColor()
{
Color aColor = getCoreObject()->GetColor();
return sal_Int32(aColor);
}
-void ScColorScaleEntryObj::setColor(util::Color aColor)
+void ScColorScaleEntryObj::setColor(sal_Int32 aColor)
{
getCoreObject()->SetColor(Color(aColor));
}
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 61581d513e7a..8a7c786a9a3e 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -360,7 +360,7 @@ OUString ScRowBar::GetDragHelp( long nVal )
return lcl_MetricString( nTwips, ScResId(STR_TIP_HEIGHT) );
}
-SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo ) const // override only for rows
+SCCOLROW ScRowBar::GetHiddenCount( SCCOLROW nEntryNo ) const // override only for rows
{
const ScViewData& rViewData = pTabView->GetViewData();
ScDocument* pDoc = rViewData.GetDocument();
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index fa189f67da09..5e58a2af8fb1 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -728,7 +728,7 @@ inline ConvertDataClass ConvertData::Class() const
return eClass;
}
-inline ConvertDataLinear::ConvertDataLinear( const sal_Char* p, double fC, double fO, ConvertDataClass e,
+inline ConvertDataLinear::ConvertDataLinear( const sal_Char p[], double fC, double fO, ConvertDataClass e,
bool bPrefSupport ) :
ConvertData( p, fC, e, bPrefSupport ),
fOffs( fO )
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index 379edc9eba4e..cb91df1caf3b 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::presentation;
using ::com::sun::star::drawing::XShape;
/** returns a helper class to manipulate effects inside the main sequence */
-sd::MainSequencePtr const & SdPage::getMainSequence()
+std::shared_ptr< sd::MainSequence > const & SdPage::getMainSequence()
{
if (nullptr == mpMainSequence)
mpMainSequence.reset( new sd::MainSequence( getAnimationNode() ) );
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index f96cb090ad25..dfc923a01c6b 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list