dbaccess/source/core/dataaccess/ContentHelper.cxx | 15
------
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 5 +-
dbaccess/source/core/dataaccess/documentcontainer.cxx | 5 --
dbaccess/source/core/inc/ContentHelper.hxx | 4 -
dbaccess/source/ui/control/curledit.cxx | 2
editeng/source/editeng/editobj.cxx | 1
editeng/source/editeng/editobj2.hxx | 3 -
filter/source/graphicfilter/itiff/itiff.cxx | 2
filter/source/svg/presentation_engine.js | 24
+++++-----
forms/source/component/DatabaseForm.hxx | 4 -
framework/source/fwi/uielement/constitemcontainer.cxx | 2
framework/source/services/pathsettings.cxx | 2
framework/source/tabwin/tabwindow.cxx | 2
framework/source/uiconfiguration/imagemanagerimpl.cxx | 2
framework/source/uielement/addonstoolbarmanager.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 4 -
framework/source/uielement/toolbarmodemenucontroller.cxx | 2
framework/source/uifactory/uicontrollerfactory.cxx | 2
include/test/drawing/xshape.hxx | 5 +-
include/vcl/salnativewidgets.hxx | 2
officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs | 4 -
sc/qa/uitest/calc_tests8/tdf119343.py | 2
sc/uiconfig/scalc/ui/notebookbar_compact.ui | 2
sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 2
svx/source/dialog/measctrl.cxx | 3 +
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 2
vcl/qt5/Qt5Frame.cxx | 2
vcl/source/gdi/dibtools.cxx | 2
vcl/unx/gtk/gtksalmenu.cxx | 11 ++++
29 files changed, 61 insertions(+), 59 deletions(-)
New commits:
commit f6664e1a485f459d010c344af100f9d337941a7c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Jun 23 16:09:24 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Jun 23 19:40:27 2019 +0200
Resolves: tdf#125168 label mnemonic appearing in database url
Change-Id: I39531ae2a656c16c7355d73b76cb918d3535f7b0
Reviewed-on: https://gerrit.libreoffice.org/74602
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/ui/control/curledit.cxx
b/dbaccess/source/ui/control/curledit.cxx
index 3568f482c8fa..eadc67c6de30 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -78,7 +78,7 @@ void OConnectionURLEdit::SetText(const OUString& _rStr, const
Selection& /*_rNew
OUString OConnectionURLEdit::GetText() const
{
- return m_xForcedPrefix->get_label() + m_xEntry->get_text();
+ return m_xForcedPrefix->strip_mnemonic(m_xForcedPrefix->get_label()) +
m_xEntry->get_text();
}
void OConnectionURLEdit::ShowPrefix(bool _bShowPrefix)
commit 27af6368d3157596f084f88c1efdd3eeca243a37
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Tue May 14 21:24:05 2019 +0000
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sun Jun 23 19:02:55 2019 +0200
Fix typo
Change-Id: I1586aa67c51a54e5a244126763be0a549a2fe7a6
Reviewed-on: https://gerrit.libreoffice.org/73135
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 956efdbb4f6c..79a4d85aa66b 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -113,7 +113,7 @@ private:
sal_uInt8* getMapData(sal_uInt32 np);
bool ReadMap();
- // reads/decompresses the bitmap data and fills aMap
+ // reads/decompress the bitmap data and fills aMap
sal_uInt32 GetBits(const sal_uInt8 * pSrc, sal_uInt32 nBitsPos, sal_uInt32
nBitsCount);
// fetches BitsCount bits from pSrc[..] at the position nBitsPos
commit e2cd0d9ba59bbfaf37523e90f88454f65adeb5fb
Author: Sumit Chauhan <sumitc...@gmail.com>
AuthorDate: Thu Jun 20 17:45:34 2019 +0530
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Sun Jun 23 18:54:37 2019 +0200
Seprator is positioned correctly in view->userInterface
It is used differentiate between normal interfaces and
notebookbar interfaces in view -> user interface.
Change-Id: I691e7a767c1984dfa4bd7e064adf2f24e1381991
Reviewed-on: https://gerrit.libreoffice.org/74446
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx
b/framework/source/uielement/toolbarmodemenucontroller.cxx
index e94b89587077..9852adf70eee 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -141,7 +141,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
// Allow Notebookbar only in experimental mode
if ( isExperimental && !aMiscOptions.IsExperimentalMode() )
continue;
- if ( !isExperimental )
+ if(aLabel == "Sidebar" || aLabel == "Standard Toolbar" || aLabel ==
"Single Toolbar")
nCountToolbar++;
m_xPopupMenu->insertItem( nReadIndex+1, aLabel,
css::awt::MenuItemStyle::RADIOCHECK, nPosition );
commit 958e304490a23ef4964270ffa7a2ed0e76e39a0c
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Sat Jun 22 14:15:43 2019 -0700
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Sun Jun 23 17:59:21 2019 +0200
Use in-class member initializers
Don't use a default ctor that only initializes data members, but rather
in-class member initializers. Follow CppCoreGuidelines rule C.45
(see
https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rc-default).
Change-Id: I52d26fa0393f7e383beb95456dd016aa0e84b777
Reviewed-on: https://gerrit.libreoffice.org/74589
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/include/test/drawing/xshape.hxx b/include/test/drawing/xshape.hxx
index 7da565355635..2e9c26c9df9a 100644
--- a/include/test/drawing/xshape.hxx
+++ b/include/test/drawing/xshape.hxx
@@ -20,7 +20,8 @@ namespace apitest
class OOO_DLLPUBLIC_TEST XShape
{
public:
- XShape(bool bObjSupportsPosition = true)
+ XShape() = default;
+ XShape(bool bObjSupportsPosition)
: m_bObjSupportsPosition(bObjSupportsPosition)
{
}
@@ -33,7 +34,7 @@ protected:
~XShape() {}
private:
- bool const m_bObjSupportsPosition;
+ bool const m_bObjSupportsPosition{ true };
};
} // namespace apitest
commit 8e7f87e7561197f03542a80aaa612a2b6f964d40
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sat Jun 22 21:44:18 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sun Jun 23 17:31:02 2019 +0200
Also treat negative DIBInfoHeader::nX/YPelsPerMeter as an error
According to
<https://docs.microsoft.com/en-us/previous-versions/dd183376(v=vs.85)>
"BITMAPINFOHEADER structure", all of the biWidth, biHeight,
biXPelsPerMeter, and
biYPelsPerMeter members are of signed type LONG, but only for biHeight
negative
values are documented as meaningful. As this code already rejecte negative
values for biHeight, do so also for biXPelsPerMeter and biYPelsPerMeter.
Otherwise, `--convert-to pdf caolan/id:000164,src:000000,op:havoc,rep:8.bmp`
(from the crashtestdata files) would fail with
> vcl/source/filter/jpeg/jpegc.cxx:404:23: runtime error: -12.549 is
outside the range of representable values of type 'unsigned short'
> #0 in WriteJPEG(JPEGWriter*, void*, long, long, basegfx::B2DVector
const&, bool, long, long,
com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&)
at vcl/source/filter/jpeg/jpegc.cxx:404:23
> #1 in JPEGWriter::Write(Graphic const&) at
vcl/source/filter/jpeg/JpegWriter.cxx:240:16
> #2 in ExportJPEG(SvStream&, Graphic const&,
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const*,
bool*) at vcl/source/filter/jpeg/jpeg.cxx:69:32
> #3 in GraphicFilter::ExportGraphic(Graphic const&, rtl::OUString const&,
SvStream&, unsigned short,
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const*) at
vcl/source/filter/graphicfilter.cxx:2042:22
[...]
because the (maliciously crafted?) bmp file has a negative nYPelsPerMeter
that
translates into a negative rPPI.getY().
Change-Id: Id6dddd86d7111ae1a644337288e9f1023cb47670
Reviewed-on: https://gerrit.libreoffice.org/74582
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 57de6fb08ab0..c8f64318f0fd 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -267,7 +267,7 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header&
rHeader, bool& bTopDown
bTopDown = false;
}
- if ( rHeader.nWidth < 0 )
+ if ( rHeader.nWidth < 0 || rHeader.nXPelsPerMeter < 0 ||
rHeader.nYPelsPerMeter < 0 )
{
rIStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
}
commit 92cf12ea025dfda642809d297a015131c1925052
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jun 22 20:34:06 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Jun 23 16:55:36 2019 +0200
tdf#125803 deactivate the menu regardless of menu item type
spacebar will toggle radios and checkbuttons without automatically
closing the menu. To handle this properly I imagine we need to set groups
for the
radiobuttons so the others visually untoggle when the active one is togged
and
we would further need to teach vcl that the state can change more than once.
so simpler to just dropdown the menus no matter what type was activated,
which won't happen in the unity case, but that's presumably mostly gone
by now(?)
Change-Id: I2ba841dd192c1461ef26d8395ba572843f4c5c4f
Reviewed-on: https://gerrit.libreoffice.org/74580
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index e3d9dc85c087..0d149bf4b30c 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -1220,6 +1220,17 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
MenuAndId aMenuAndId = decode_command(pCommand);
GtkSalMenu* pSalSubMenu = aMenuAndId.first;
GtkSalMenu* pTopLevel = pSalSubMenu->GetTopLevel();
+ if (pTopLevel->mpMenuBarWidget)
+ {
+ // tdf#125803 spacebar will toggle radios and checkbuttons without
automatically
+ // closing the menu. To handle this properly I imagine we need to set
groups for the
+ // radiobuttons so the others visually untoggle when the active one is
togged and
+ // we would further need to teach vcl that the state can change more
than once.
+ //
+ // or we could unconditonally deactivate the menus if regardless of
what particular
+ // type of menu item got activated
+ gtk_menu_shell_deactivate(GTK_MENU_SHELL(pTopLevel->mpMenuBarWidget));
+ }
pTopLevel->GetMenu()->HandleMenuCommandEvent(pSalSubMenu->GetMenu(),
aMenuAndId.second);
}
commit 4f113609feae412a79edbdffcc2f34600c79ee63
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jun 14 22:42:45 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 16:18:20 2019 +0200
Fix typo
Change-Id: Ie4a0e69b78f671f9990f9c750e5ecb63447efe2b
Reviewed-on: https://gerrit.libreoffice.org/74599
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 16502d124de6..6e8fc6993d96 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -585,7 +585,7 @@ void ToolBarManager::impl_elementChanged(bool const
isRemove,
if (( pIter->second.nImageInfo == 0 ) && (
pIter->second.nImageInfo == nImageInfo ))
{
// Special case: An image from the document image
manager has been removed.
- // It is possible that we have a image at our module
image manager. Before
+ // It is possible that we have an image at our module
image manager. Before
// we can remove our image we have to ask our module
image manager.
Sequence< OUString > aCmdURLSeq( 1 );
Sequence< Reference< XGraphic > > aGraphicSeq;
@@ -841,7 +841,7 @@ void ToolBarManager::CreateControllers()
}
}
- // Request a item window from the toolbar controller and set it at
the VCL toolbar
+ // Request an item window from the toolbar controller and set it
at the VCL toolbar
Reference< XToolbarController > xTbxController( xController,
UNO_QUERY );
if ( xTbxController.is() && xToolbarWindow.is() )
{
commit a8109450300ab74d8aadb24204e33c16d46ff637
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jun 14 22:42:44 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 16:17:54 2019 +0200
Fix typo
Change-Id: Ib405a8287833f596aa90ae6496b748bf8d45f3c3
Reviewed-on: https://gerrit.libreoffice.org/74601
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx
b/framework/source/uifactory/uicontrollerfactory.cxx
index deaf29485c6c..335854e01685 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -125,7 +125,7 @@ Reference< XInterface > SAL_CALL
UIControllerFactory::createInstanceWithArgument
OUString aPropName;
PropertyValue aPropValue;
- // Retrieve the optional module name form the Arguments sequence. It is
used as a part of
+ // Retrieve the optional module name from the Arguments sequence. It is
used as a part of
// the hash map key to support different controller implementation for the
same URL but different
// module!!
for ( int i = 0; i < Arguments.getLength(); i++ )
commit 649b0d30ea100c8f69e849671e8ce3e42bc9e850
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jun 22 21:00:20 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Jun 23 15:42:59 2019 +0200
Resolves: tdf#126039 erase old content before drawing new content
Change-Id: I0006467f5c172b6a0cb8b9bc4c9a0181fd57a8ac
Reviewed-on: https://gerrit.libreoffice.org/74583
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 507f7ff34329..0a0741bbe922 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -77,6 +77,9 @@ SvxXMeasurePreview::~SvxXMeasurePreview()
void SvxXMeasurePreview::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
{
+
rRenderContext.SetBackground(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
+ rRenderContext.Erase();
+
rRenderContext.Push(PushFlags::MAPMODE);
rRenderContext.SetMapMode(m_aMapMode);
commit 7a8f925d67f38fb14bf8df512f62828299ac37ca
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jun 14 22:42:47 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 14:05:01 2019 +0200
Fix typo
Change-Id: I30d3a4e7c30dcd1717663f152221f81769b08459
Reviewed-on: https://gerrit.libreoffice.org/74597
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx
b/framework/source/uielement/addonstoolbarmanager.cxx
index 9cdcfeb838db..3fb7a775dc73 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -326,7 +326,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence<
Sequence< PropertyValue
}
}
- // Request a item window from the toolbar controller and set
it at the VCL toolbar
+ // Request an item window from the toolbar controller and set
it at the VCL toolbar
Reference< XToolbarController > xTbxController( xController,
UNO_QUERY );
if ( xTbxController.is() && xToolbarWindow.is() )
{
commit a5082e554ba6448120e20ec5167edc039026d873
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Tue Jun 18 23:35:53 2019 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 14:02:33 2019 +0200
Fix typo
Change-Id: I5cfe3c3157b60ebd71989d1ca105283392c03fc0
Reviewed-on: https://gerrit.libreoffice.org/74313
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index c360e751161d..eda195389b3a 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -14986,7 +14986,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Tools-Section-Form-Wizzard">
+ <object class="sfxlo-OptionalBox"
id="Tools-Section-Form-Wizard">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index e37a67487ee6..ea9e2e759723 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -19385,7 +19385,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Tools-Section-Form-Wizzard">
+ <object class="sfxlo-OptionalBox"
id="Tools-Section-Form-Wizard">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 97a30173f1f0..4f1e630ddbeb 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -16843,7 +16843,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Tools-Section-Form-Wizzard">
+ <object class="sfxlo-OptionalBox"
id="Tools-Section-Form-Wizard">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
commit 4c492a79adbc0d35122bf50c5216a0e6a6bf66c0
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jun 14 22:43:12 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 14:01:27 2019 +0200
Fix typo
Change-Id: Ib555f767f4d0c6f9b958b3aaf9a496bf8c31de5e
Reviewed-on: https://gerrit.libreoffice.org/74319
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx
b/framework/source/fwi/uielement/constitemcontainer.cxx
index 03d638f10ae6..75121b08ccb8 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -269,7 +269,7 @@ Any SAL_CALL ConstItemContainer::getFastPropertyValue(
sal_Int32 nHandle )
const css::uno::Sequence< css::beans::Property >
ConstItemContainer::impl_getStaticPropertyDescriptor()
{
// Create a property array to initialize sequence!
- // Table of all predefined properties of this class. Its used from
OPropertySetHelper-class!
+ // Table of all predefined properties of this class. It's used from
OPropertySetHelper-class!
// Don't forget to change the defines (see begin of this file), if you
add, change or delete a property in this list!!!
// It's necessary for methods of OPropertySetHelper.
// ATTENTION:
commit 547d68a175e316e4d20a4f19c148579370fa0a50
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Mon Jun 10 21:31:37 2019 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:59:10 2019 +0200
Fix typos
Change-Id: Id805595850125de5d791f016649b660a7fedba8a
Reviewed-on: https://gerrit.libreoffice.org/73779
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
index b8c69f354398..9149f900f33b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
@@ -70,8 +70,8 @@
List of context descriptors. Each context descriptor is a string
that contains three comma
separated values (note that values are case sensitive):
1. UIItemID - contains the ID of uiitem(GtkToolButton/GtkMenuItem)
of notebookbar
- 2. propertyName - contains the value of attibute(name) of property
node.
- 3. propertyValue - cotains the value of property node.
+ 2. propertyName - contains the value of attribute(name) of property
node.
+ 3. propertyValue - contains the value of property node.
</desc>
</info>
</prop>
commit 794102acd8b325c565d34d3e3f73f6c83a80cf7c
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Tue May 14 21:23:30 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:58:42 2019 +0200
Fix typos
Change-Id: If81c6224abbd0028bcc446159cf12436e89325d8
Reviewed-on: https://gerrit.libreoffice.org/73421
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/forms/source/component/DatabaseForm.hxx
b/forms/source/component/DatabaseForm.hxx
index 19483b27db5e..3e5c161f5743 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -207,8 +207,8 @@ class ODatabaseForm :public OFormComponents
// </properties>
bool m_bLoaded : 1;
bool m_bSubForm : 1;
- bool m_bForwardingConnection : 1; // sal_True if we're
setting the ActiveConnection on the aggregate
- bool m_bSharingConnection : 1; // sal_True if the
connection we're using is shared with out parent
+ bool m_bForwardingConnection : 1; // true if we're
setting the ActiveConnection on the aggregate
+ bool m_bSharingConnection : 1; // true if the
connection we're using is shared with our parent
public:
explicit ODatabaseForm(const css::uno::Reference<
css::uno::XComponentContext>& _rxFactory);
commit ec72bb42e54e5a1ca0f5c54bb6dc656936a16bcf
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Tue May 14 21:23:56 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:54:17 2019 +0200
Fix typo
Change-Id: If1f6d73088e87db6e91916ba338725054f63b5ac
Reviewed-on: https://gerrit.libreoffice.org/73231
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 87f4dc162b0e..8e01bfeba182 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -288,7 +288,7 @@ function splitStr(str) {
}
/**
- * find if a array contains the object using indexOf or a simple polyFill
+ * find if an array contains the object using indexOf or a simple polyFill
* @param {Array} src
* @param {String} find
* @param {String} [findByKey]
@@ -1372,8 +1372,8 @@ function getTouchActionProps() {
/**
* Recognizer flow explained; *
- * All recognizers have the initial state of POSSIBLE when a input session
starts.
- * The definition of a input session is from the first input until the last
input, with all it's movement in it. *
+ * All recognizers have the initial state of POSSIBLE when an input session
starts.
+ * The definition of an input session is from the first input until the last
input, with all it's movement in it. *
* Example session for mouse-input: mousedown -> mousemove -> mouseup
*
* On each recognizing cycle (see Manager.recognize) the .recognize() method
is executed
@@ -1448,7 +1448,7 @@ Recognizer.prototype = {
},
/**
- * recognize simultaneous with an other recognizer.
+ * recognize simultaneous with another recognizer.
* @param {Recognizer} otherRecognizer
* @returns {Recognizer} this
*/
@@ -1467,7 +1467,7 @@ Recognizer.prototype = {
},
/**
- * drop the simultaneous link. it doesnt remove the link on the other
recognizer.
+ * drop the simultaneous link. It doesn't remove the link on the other
recognizer.
* @param {Recognizer} otherRecognizer
* @returns {Recognizer} this
*/
@@ -1482,7 +1482,7 @@ Recognizer.prototype = {
},
/**
- * recognizer can only run when an other is failing
+ * recognizer can only run when another is failing
* @param {Recognizer} otherRecognizer
* @returns {Recognizer} this
*/
@@ -1501,7 +1501,7 @@ Recognizer.prototype = {
},
/**
- * drop the requireFailure link. it does not remove the link on the other
recognizer.
+ * drop the requireFailure link. It does not remove the link on the other
recognizer.
* @param {Recognizer} otherRecognizer
* @returns {Recognizer} this
*/
@@ -1527,7 +1527,7 @@ Recognizer.prototype = {
},
/**
- * if the recognizer can recognize simultaneous with an other recognizer
+ * if the recognizer can recognize simultaneous with another recognizer
* @param {Recognizer} otherRecognizer
* @returns {Boolean}
*/
@@ -1603,7 +1603,7 @@ Recognizer.prototype = {
// so we can change the inputData without messing up the other
recognizers
var inputDataClone = assign({}, inputData);
- // is is enabled and allow recognizing?
+ // is it enabled and allow recognizing?
if (!boolOrFn(this.options.enable, [this, inputDataClone])) {
this.reset();
this.state = STATE_FAILED;
@@ -2037,7 +2037,7 @@ inherit(SwipeRecognizer, AttrRecognizer, {
});
/**
- * A tap is ecognized when the pointer is doing a small tap/click. Multiple
taps are recognized if they occur
+ * A tap is recognized when the pointer is doing a small tap/click. Multiple
taps are recognized if they occur
* between the given interval and position. The delay option can be used to
recognize multi-taps without firing
* a single tap.
*
@@ -2113,7 +2113,7 @@ inherit(TapRecognizer, Recognizer, {
this._input = input;
// if tap count matches we have recognized it,
- // else it has began recognizing...
+ // else it has begun recognizing...
var tapCount = this.count % options.taps;
if (tapCount === 0) {
// no failing requirements, immediately trigger the tap event
@@ -14247,7 +14247,7 @@ AnimatedElement.prototype.getBBoxWithStroke = function()
var nHalfStrokeWidth = nStrokeWidth / 2;
var nDoubleStrokeWidth = nStrokeWidth * 2;
- // Note: IE10 don't let modify the values of a element BBox.
+ // Note: IE10 don't let modify the values of an element BBox.
var aEBBox = document.documentElement.createSVGRect();
aEBBox.x = aBBox.x - nHalfStrokeWidth;
aEBBox.y = aBBox.y - nHalfStrokeWidth;
commit 6a6791af2ab9c59f3a8ed2d71c0cbd0524b2ea32
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Wed May 29 11:07:58 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:50:55 2019 +0200
Fix typo
Change-Id: I528581c5a17e804f7ba39a069e7bb8ac8d005adc
Reviewed-on: https://gerrit.libreoffice.org/73223
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sc/qa/uitest/calc_tests8/tdf119343.py
b/sc/qa/uitest/calc_tests8/tdf119343.py
index 14e8991a997e..82c0e11b4d39 100644
--- a/sc/qa/uitest/calc_tests8/tdf119343.py
+++ b/sc/qa/uitest/calc_tests8/tdf119343.py
@@ -19,7 +19,7 @@ from uitest.path import get_srcdir_url
def get_url_for_data_file(file_name):
return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-#Bug 119343 - EDITING: copied and pasted cells containing formulas are not
recalcuated (2)
+#Bug 119343 - EDITING: copied and pasted cells containing formulas are not
recalculated (2)
class tdf119343(UITestCase):
def test_tdf119343_copy_paste_formula(self):
commit 014e270607f6af5e749c0013c2a84f77a97f2c17
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Sat Jun 22 08:42:07 2019 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:09:10 2019 +0200
Fix typo
Change-Id: I3a4b8aad30f4d8bcfda472ddfd151410db21a5b1
Reviewed-on: https://gerrit.libreoffice.org/74551
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 2a67ceb47b24..77f0cc72b647 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -348,7 +348,7 @@ class VCL_DLLPUBLIC TabPaneValue : public ImplControlValue
public:
tools::Rectangle m_aTabHeaderRect;
tools::Rectangle m_aSelectedTabRect;
- // increased tab size, so it'll overlab the frame rect when draing
+ // increased tab size, so it'll overlab the frame rect when drawing
// static value, as there is currently no sane way to return additional
data
static int m_nOverlap;
commit d6e325eb4e944a687b142b4ca7a035d38c123658
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jun 14 22:42:51 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:08:43 2019 +0200
Fix typo
Change-Id: I580bfda7af2f29484817d8e88ba74cb3c43a98fd
Reviewed-on: https://gerrit.libreoffice.org/74560
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index 8781a76994bb..a008a3a97578 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -419,7 +419,7 @@ private:
virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue,
sal_Int32 nHandle ) const override;
// Avoid:
- // warning: ‘virtual css::uno::Any
cppu::OPropertySetHelper::getFastPropertyValue(sal_Int32)’ was hidden
[-Woverloaded-virtual]
+ // warning: 'virtual css::uno::Any
cppu::OPropertySetHelper::getFastPropertyValue(sal_Int32)' was hidden
[-Woverloaded-virtual]
// warning: by ‘virtual void
{anonymous}::PathSettings::getFastPropertyValue(css::uno::Any&, sal_Int32)
const’ [-Woverloaded-virtual]
using cppu::OPropertySetHelper::getFastPropertyValue;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
commit 314d15e8ec454795d609892bf743c198a4638f2c
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Sun Jun 23 12:04:12 2019 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:08:21 2019 +0200
Fix typo
Change-Id: I357c004e724ebe580a121bf7ecdc63da9c02343f
Reviewed-on: https://gerrit.libreoffice.org/74593
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index d585f627b7fd..7559b42d0f86 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -460,7 +460,7 @@ void Qt5Frame::SetPosSize(long nX, long nY, long nWidth,
long nHeight, sal_uInt1
asChild()->setFixedSize(nWidth, nHeight);
// assume the resize happened
- // needed for calculations and will eventuall be corrected by
events
+ // needed for calculations and will eventually be corrected by
events
maGeometry.nWidth = nWidth;
maGeometry.nHeight = nHeight;
}
commit b9c00b3c5d90b80248577403ce56c8668a51b315
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jun 14 22:42:49 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:07:58 2019 +0200
Fix typo
Change-Id: I7e6be2abe50487df7da5486ad9b98aabc67b1caa
Reviewed-on: https://gerrit.libreoffice.org/74592
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/framework/source/tabwin/tabwindow.cxx
b/framework/source/tabwin/tabwindow.cxx
index 2bd9f27750bf..4f42d0960136 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -835,7 +835,7 @@ css::uno::Reference< css::beans::XPropertySetInfo >
SAL_CALL TabWindow::getPrope
const css::uno::Sequence< css::beans::Property >
TabWindow::impl_getStaticPropertyDescriptor()
{
// Create property array to initialize sequence!
- // Table of all predefined properties of this class. Its used from
OPropertySetHelper-class!
+ // Table of all predefined properties of this class. It's used from
OPropertySetHelper-class!
// Don't forget to change the defines (see begin of this file), if you
add, change or delete a property in this list!!!
// It's necessary for methods of OPropertySetHelper.
// ATTENTION:
commit 02efb7a6fdfe62bea198d3851e38696131363c2d
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jun 14 22:42:48 2019 +0000
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 23 13:07:43 2019 +0200
Fix typo
Change-Id: I126a490e40d5954f290200edaa377427f59f244a
Reviewed-on: https://gerrit.libreoffice.org/74596
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 393757de5f84..ff53261f56b8 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -884,7 +884,7 @@ void ImageManagerImpl::removeImages( ::sal_Int16
nImageType, const Sequence< OUS
if ( m_bUseGlobal )
{
- // Check, if we have a image in our module/global image
list. If we find one =>
+ // Check, if we have an image in our module/global image
list. If we find one =>
// this is a replace instead of a remove operation!
Image aNewImage =
pDefaultImageList->getImageFromCommandURL( nIndex, aCommandURLSequence[i] );
if ( !aNewImage )
commit 869d1c404c7bcab6bce59a9abea45ca583f77468
Author: Adrien Ollier <adr.oll...@hotmail.fr>
AuthorDate: Tue May 14 18:47:07 2019 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sun Jun 23 12:23:50 2019 +0200
editeng/XParaPortionList: OutputDevice's MapMode
Change-Id: I77098fd15e131711e4f2a7ef4f21bd1dd8d68768
Signed-off-by: Adrien Ollier <adr.oll...@hotmail.fr>
Reviewed-on: https://gerrit.libreoffice.org/72307
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 496bde7284d5..ad096dfa7f82 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -92,7 +92,6 @@ void XEditAttribute::SetItem(const SfxPoolItem& rNew)
XParaPortionList::XParaPortionList(
OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16
_nStretchY)
: pRefDevPtr(pRefDev)
- , aRefMapMode(pRefDev->GetMapMode())
, nStretchX(_nStretchX)
, nStretchY(_nStretchY)
, nPaperWidth(nPW)
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index c833e4b57d99..f3436930c484 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -97,7 +97,6 @@ class XParaPortionList
ListType maList;
VclPtr<OutputDevice> pRefDevPtr;
- MapMode aRefMapMode;
sal_uInt16 nStretchX;
sal_uInt16 nStretchY;
sal_uLong nPaperWidth;
@@ -111,7 +110,7 @@ public:
OutputDevice* GetRefDevPtr() const { return pRefDevPtr; }
sal_uLong GetPaperWidth() const { return nPaperWidth; }
bool RefDevIsVirtual() const {return
pRefDevPtr->IsVirtual();}
- const MapMode& GetRefMapMode() const { return aRefMapMode; }
+ const MapMode& GetRefMapMode() const { return
pRefDevPtr->GetMapMode(); }
sal_uInt16 GetStretchX() const { return nStretchX; }
sal_uInt16 GetStretchY() const { return nStretchY; }
};
commit 6d4039c130896c57363bb60982c0b5601c4f0c3e
Author: Arkadiy Illarionov <qar...@gmail.com>
AuthorDate: Fri Jun 21 23:21:17 2019 +0300
Commit: Arkadiy Illarionov <qar...@gmail.com>
CommitDate: Sun Jun 23 10:12:15 2019 +0200
tdf#39593 Remove dbaccess::OContentHelper::getImplementation
Replace with comphelper::getUnoTunnelImplementation.
Change-Id: I533bfcd3959037a2621eb3fd42bf7172b5396c5f
Reviewed-on: https://gerrit.libreoffice.org/74539
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov <qar...@gmail.com>
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 479bcddaa38c..b8e7502247f6 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -83,7 +83,7 @@ void SAL_CALL OContentHelper::disposing()
IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun.star.ucb.Content");
-css::uno::Sequence<sal_Int8> OContentHelper::getUnoTunnelImplementationId()
+css::uno::Sequence<sal_Int8> OContentHelper::getUnoTunnelId()
{
static cppu::OImplementationId aId;
return aId.getImplementationId();
@@ -541,23 +541,12 @@ void OContentHelper::notifyPropertiesChange( const
Sequence< PropertyChangeEvent
// css::lang::XUnoTunnel
sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId )
{
- if (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
+ if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
return reinterpret_cast<sal_Int64>(this);
return 0;
}
-OContentHelper* OContentHelper::getImplementation( const Reference< XInterface
>& _rxComponent )
-{
- OContentHelper* pContent( nullptr );
-
- Reference< XUnoTunnel > xUnoTunnel( _rxComponent, UNO_QUERY );
- if ( xUnoTunnel.is() )
- pContent = reinterpret_cast< OContentHelper* >(
xUnoTunnel->getSomething( getUnoTunnelImplementationId() ) );
-
- return pContent;
-}
-
Reference< XInterface > SAL_CALL OContentHelper::getParent( )
{
::osl::MutexGuard aGuard(m_aMutex);
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index c099c0fe8e84..1e0249f32c3b 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/ucb/CommandInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/ErrorCondition.hpp>
+#include <comphelper/servicehelper.hxx>
#include <comphelper/types.hxx>
#include <ucbhelper/contentidentifier.hxx>
@@ -530,7 +531,7 @@ void ODefinitionContainer::implAppend(const OUString&
_rName, const Reference< X
// #i44786#
lcl_ensureName( _rxNewObject, _rName );
- ::rtl::Reference< OContentHelper > pContent =
OContentHelper::getImplementation( _rxNewObject );
+ ::rtl::Reference< OContentHelper > pContent =
comphelper::getUnoTunnelImplementation<OContentHelper>( _rxNewObject );
if ( pContent.is() )
{
TContentPtr pImpl = pContent->getImpl();
@@ -589,7 +590,7 @@ void ODefinitionContainer::approveNewObject(const OUString&
_sName,const Referen
DBA_RES( RID_STR_NAME_ALREADY_USED ),
*this );
- ::rtl::Reference< OContentHelper > pContent(
OContentHelper::getImplementation( _rxObject ) );
+ ::rtl::Reference< OContentHelper > pContent(
comphelper::getUnoTunnelImplementation<OContentHelper>( _rxObject ) );
if ( !pContent.is() )
throw IllegalArgumentException(
DBA_RES( RID_STR_OBJECT_CONTAINER_MISMATCH ),
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 9e9a1f8918ea..54e338bcbd00 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -37,6 +37,7 @@
#include <strings.hrc>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/propertysequence.hxx>
+#include <comphelper/servicehelper.hxx>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <vcl/svapp.hxx>
@@ -633,9 +634,7 @@ OUString SAL_CALL
ODocumentContainer::composeHierarchicalName( const OUString& i
::rtl::Reference<OContentHelper> pContent;
try
{
- Reference<XUnoTunnel>
xUnoTunnel(const_cast<ODocumentContainer*>(this)->implGetByName( _sName, true
), UNO_QUERY );
- if ( xUnoTunnel.is() )
- pContent =
reinterpret_cast<OContentHelper*>(xUnoTunnel->getSomething(OContentHelper::getUnoTunnelImplementationId()));
+ pContent =
comphelper::getUnoTunnelImplementation<OContentHelper>(const_cast<ODocumentContainer*>(this)->implGetByName(
_sName, true ));
}
catch(const Exception&)
{
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx
b/dbaccess/source/core/inc/ContentHelper.hxx
index a1cd45ca094d..93290fda2d52 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -133,7 +133,7 @@ namespace dbaccess
// css::lang::XTypeProvider
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( )
override;
- static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
+
// css::lang::XServiceInfo
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName
) override;
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( ) override;
@@ -163,7 +163,7 @@ namespace dbaccess
// css::lang::XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& aIdentifier ) override;
- static OContentHelper* getImplementation( const css::uno::Reference<
css::uno::XInterface >& _rxComponent );
+ static css::uno::Sequence< sal_Int8 > getUnoTunnelId();
// css::container::XChild
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
getParent( ) override;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
