desktop/source/lib/init.cxx | 18 +++++++++---------
include/vcl/customweld.hxx | 6 +++---
include/vcl/weld.hxx | 4 ++--
sc/source/ui/app/inputwin.cxx | 2 +-
sd/source/ui/inc/ViewShell.hxx | 2 +-
sd/source/ui/unoidl/unomodel.cxx | 2 +-
sd/source/ui/view/viewshel.cxx | 2 +-
svx/source/gallery2/galbrws2.cxx | 4 ++--
svx/source/tbxctrls/colrctrl.cxx | 2 +-
vcl/inc/unx/gtk/gtkinst.hxx | 2 +-
vcl/unx/gtk3/gtkframe.cxx | 4 ++--
11 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit cd45ff66cfdb8d4417e159aaae59060dc232e810
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Sun Jul 31 10:40:20 2022 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Aug 1 21:37:18 2022 +0200
Fix typo in code
It passed "make check" on my laptop
Change-Id: I2d231c3a8ec40b63026a4b81256b98ee4be0ae1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137660
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 74349ace09a4..6f1135248675 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4558,7 +4558,7 @@ static void
doc_setWindowTextSelection(LibreOfficeKitDocument* /*pThis*/, unsign
Application::PostMouseEvent(VclEventId::WindowMouseButtonUp, pWindow,
&aCursorEvent);
}
-static bool getFromTransferrable(
+static bool getFromTransferable(
const css::uno::Reference<css::datatransfer::XTransferable> &xTransferable,
const OString &aInMimeType, OString &aRet);
@@ -4566,7 +4566,7 @@ static bool encodeImageAsHTML(
const css::uno::Reference<css::datatransfer::XTransferable> &xTransferable,
const OString &aMimeType, OString &aRet)
{
- if (!getFromTransferrable(xTransferable, aMimeType, aRet))
+ if (!getFromTransferable(xTransferable, aMimeType, aRet))
return false;
// Encode in base64.
@@ -4592,7 +4592,7 @@ static bool encodeTextAsHTML(
const css::uno::Reference<css::datatransfer::XTransferable> &xTransferable,
const OString &aMimeType, OString &aRet)
{
- if (!getFromTransferrable(xTransferable, aMimeType, aRet))
+ if (!getFromTransferable(xTransferable, aMimeType, aRet))
return false;
// Embed in HTML - FIXME: needs some escaping.
@@ -4606,7 +4606,7 @@ static bool encodeTextAsHTML(
return true;
}
-static bool getFromTransferrable(
+static bool getFromTransferable(
const css::uno::Reference<css::datatransfer::XTransferable> &xTransferable,
const OString &aInMimeType, OString &aRet)
{
@@ -4709,7 +4709,7 @@ static char* doc_getTextSelection(LibreOfficeKitDocument*
pThis, const char* pMi
pType = "text/plain;charset=utf-8";
OString aRet;
- bool bSuccess = getFromTransferrable(xTransferable, OString(pType), aRet);
+ bool bSuccess = getFromTransferable(xTransferable, OString(pType), aRet);
if (!bSuccess)
return nullptr;
@@ -4750,7 +4750,7 @@ static int doc_getSelectionType(LibreOfficeKitDocument*
pThis)
return LOK_SELTYPE_COMPLEX;
OString aRet;
- bool bSuccess = getFromTransferrable(xTransferable,
"text/plain;charset=utf-8", aRet);
+ bool bSuccess = getFromTransferable(xTransferable,
"text/plain;charset=utf-8", aRet);
if (!bSuccess)
return LOK_SELTYPE_NONE;
@@ -4792,7 +4792,7 @@ static int
doc_getSelectionTypeAndText(LibreOfficeKitDocument* pThis, const char
pType = "text/plain;charset=utf-8";
OString aRet;
- bool bSuccess = getFromTransferrable(xTransferable, OString(pType), aRet);
+ bool bSuccess = getFromTransferable(xTransferable, OString(pType), aRet);
if (!bSuccess)
return LOK_SELTYPE_NONE;
@@ -4860,7 +4860,7 @@ static int doc_getClipboard(LibreOfficeKitDocument* pThis,
rtl::Reference<LOKClipboard>
xClip(LOKClipboardFactory::getClipboardForCurView());
css::uno::Reference<css::datatransfer::XTransferable> xTransferable =
xClip->getContents();
- SAL_INFO("lok", "Got from clip: " << xClip.get() << " transferrable: " <<
xTransferable);
+ SAL_INFO("lok", "Got from clip: " << xClip.get() << " transferable: " <<
xTransferable);
if (!xTransferable)
{
SetLastExceptionMsg("No clipboard content available");
@@ -4897,7 +4897,7 @@ static int doc_getClipboard(LibreOfficeKitDocument* pThis,
(*pOutMimeTypes)[i] = strdup(aMimeTypes[i].getStr());
OString aRet;
- bool bSuccess = getFromTransferrable(xTransferable,
(*pOutMimeTypes)[i], aRet);
+ bool bSuccess = getFromTransferable(xTransferable,
(*pOutMimeTypes)[i], aRet);
if (!bSuccess || aRet.getLength() < 1)
{
(*pOutSizes)[i] = 0;
diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx
index 196608ee53a9..c43dc9df1c85 100644
--- a/include/vcl/customweld.hxx
+++ b/include/vcl/customweld.hxx
@@ -110,10 +110,10 @@ public:
{
return m_pDrawingArea->get_clipboard();
}
- void SetDragDataTransferrable(rtl::Reference<TransferDataContainer>&
rTransferrable,
- sal_uInt8 eDNDConstants)
+ void SetDragDataTransferable(rtl::Reference<TransferDataContainer>&
rTransferable,
+ sal_uInt8 eDNDConstants)
{
- m_pDrawingArea->enable_drag_source(rTransferrable, eDNDConstants);
+ m_pDrawingArea->enable_drag_source(rTransferable, eDNDConstants);
m_pDrawingArea->connect_drag_begin(LINK(this, CustomWidgetController,
DragBeginHdl));
}
// return true to disallow drag, false to allow
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 37d65d83cb4e..11ecec27ee9a 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1270,7 +1270,7 @@ public:
m_aPopupMenuHdl = rLink;
}
- virtual void enable_drag_source(rtl::Reference<TransferDataContainer>&
rTransferrable,
+ virtual void enable_drag_source(rtl::Reference<TransferDataContainer>&
rTransferable,
sal_uInt8 eDNDConstants)
= 0;
@@ -2316,7 +2316,7 @@ public:
virtual void queue_draw() = 0;
virtual void queue_draw_area(int x, int y, int width, int height) = 0;
- virtual void enable_drag_source(rtl::Reference<TransferDataContainer>&
rTransferrable,
+ virtual void enable_drag_source(rtl::Reference<TransferDataContainer>&
rTransferable,
sal_uInt8 eDNDConstants)
= 0;
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 4ecd18c01bbf..c4e517343395 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2141,7 +2141,7 @@ void ScTextWnd::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
// the input line
m_xHelper.set(new svt::OStringTransferable(OUString()));
rtl::Reference<TransferDataContainer> xHelper(m_xHelper);
- SetDragDataTransferrable(xHelper, DND_ACTION_COPY);
+ SetDragDataTransferable(xHelper, DND_ACTION_COPY);
OutputDevice& rDevice = pDrawingArea->get_ref_device();
pDrawingArea->set_margin_start(gnBorderWidth);
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 1eeede9e249d..b3fc31bbdd00 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -414,7 +414,7 @@ public:
/// Allows adjusting the point or mark of the selection to a document
coordinate.
void SetCursorMm100Position(const Point& rPosition, bool bPoint, bool
bClearMark);
/// Gets the current selection
- css::uno::Reference<css::datatransfer::XTransferable>
GetSelectionTransferrable() const;
+ css::uno::Reference<css::datatransfer::XTransferable>
GetSelectionTransferable() const;
/// Allows starting or ending a graphic move or resize action.
void SetGraphicMm100Position(bool bStart, const Point& rPosition);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 3482600afd4c..f484f8afa6b9 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2609,7 +2609,7 @@ uno::Reference<datatransfer::XTransferable>
SdXImpressDocument::getSelection()
if (!pViewShell)
return uno::Reference<datatransfer::XTransferable>();
- return pViewShell->GetSelectionTransferrable();
+ return pViewShell->GetSelectionTransferable();
}
void SdXImpressDocument::setGraphicSelection(int nType, int nX, int nY)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index c74a2b57e64d..3f8078914016 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -522,7 +522,7 @@ void ViewShell::SetCursorMm100Position(const Point&
rPosition, bool bPoint, bool
}
}
-uno::Reference<datatransfer::XTransferable>
ViewShell::GetSelectionTransferrable() const
+uno::Reference<datatransfer::XTransferable>
ViewShell::GetSelectionTransferable() const
{
SdrView* pSdrView = GetView();
if (!pSdrView)
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 27ba2634d451..f2732757d161 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -607,8 +607,8 @@ void GalleryBrowser2::SelectTheme( std::u16string_view
rThemeName )
m_xHelper.set(new GalleryTransferable(mpCurTheme, 0, true));
rtl::Reference<TransferDataContainer> xHelper(m_xHelper);
mxListView->enable_drag_source(xHelper, DND_ACTION_COPY | DND_ACTION_LINK);
- mxIconView->SetDragDataTransferrable(xHelper, DND_ACTION_COPY |
DND_ACTION_LINK);
- mxPreview->SetDragDataTransferrable(xHelper, DND_ACTION_COPY |
DND_ACTION_LINK);
+ mxIconView->SetDragDataTransferable(xHelper, DND_ACTION_COPY |
DND_ACTION_LINK);
+ mxPreview->SetDragDataTransferable(xHelper, DND_ACTION_COPY |
DND_ACTION_LINK);
mxIconView->SetTheme(mpCurTheme);
mxPreview->SetTheme(mpCurTheme);
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index d3bc9ae24310..7747eda88616 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -94,7 +94,7 @@ void
SvxColorValueSet_docking::SetDrawingArea(weld::DrawingArea* pDrawingArea)
m_xHelper.set(new SvxColorValueSetData);
rtl::Reference<TransferDataContainer> xHelper(m_xHelper);
- SetDragDataTransferrable(xHelper, DND_ACTION_COPY);
+ SetDragDataTransferable(xHelper, DND_ACTION_COPY);
}
SvxColorValueSet_docking::SvxColorValueSet_docking(std::unique_ptr<weld::ScrolledWindow>
xWindow)
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index eb3199b58eaf..a597e5be2436 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -240,7 +240,7 @@ public:
// For LibreOffice internal D&D we provide the Transferable without Gtk
// intermediaries as a shortcut, see tdf#100097 for how dbaccess depends
on this
static GtkInstDragSource* g_ActiveDragSource;
- css::uno::Reference<css::datatransfer::XTransferable> const &
GetTransferrable() const { return m_xTrans; }
+ css::uno::Reference<css::datatransfer::XTransferable> const &
GetTransferable() const { return m_xTrans; }
};
enum SelectionType { SELECTION_CLIPBOARD = 0, SELECTION_PRIMARY = 1 };
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 0f783d9e06b5..e4cfbdc48a59 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -4862,7 +4862,7 @@ gboolean
GtkInstDropTarget::signalDragDrop(GtkDropTargetAsync* context, GdkDrop*
// For LibreOffice internal D&D we provide the Transferable without Gtk
// intermediaries as a shortcut, see tdf#100097 for how dbaccess depends
on this
if (GtkInstDragSource::g_ActiveDragSource)
- xTransferable =
GtkInstDragSource::g_ActiveDragSource->GetTransferrable();
+ xTransferable =
GtkInstDragSource::g_ActiveDragSource->GetTransferable();
else
{
#if GTK_CHECK_VERSION(4,0,0)
@@ -5048,7 +5048,7 @@ GdkDragAction
GtkInstDropTarget::signalDragMotion(GtkDropTargetAsync *context, G
// For LibreOffice internal D&D we provide the Transferable without Gtk
// intermediaries as a shortcut, see tdf#100097 for how dbaccess
depends on this
if (GtkInstDragSource::g_ActiveDragSource)
- xTransferable =
GtkInstDragSource::g_ActiveDragSource->GetTransferrable();
+ xTransferable =
GtkInstDragSource::g_ActiveDragSource->GetTransferable();
else
{
#if !GTK_CHECK_VERSION(4,0,0)
