[Libreoffice-commits] core.git: filter/source include/vcl oovbaapi/ooo vcl/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jul 25 11:26:42 UTC 2017
filter/source/xslt/import/wordml/wordml2ooo_draw.xsl | 2 +-
include/vcl/dockwin.hxx | 4 ++--
include/vcl/syswin.hxx | 4 ++--
oovbaapi/ooo/vba/msforms/XControl.idl | 2 +-
vcl/source/window/dialog.cxx | 2 +-
vcl/source/window/dockwin.cxx | 6 +++---
vcl/source/window/floatwin.cxx | 2 +-
vcl/source/window/syswin.cxx | 4 ++--
vcl/source/window/toolbox.cxx | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit cc903aee9769df035ec42e66341b6f69a4771562
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jul 25 12:09:00 2017 +0200
fix some "deffer" spelling
Change-Id: I8fa9782242e92d754eaa131d424eb0a26f04a319
Reviewed-on: https://gerrit.libreoffice.org/40394
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
index 40dd7fc93d27..d33ec347e079 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
@@ -1543,7 +1543,7 @@
</xsl:if>
</xsl:when>
<xsl:otherwise>
- <!--Means that you have to care about 2 adj parameters which is defferent-->
+ <!--Means that you have to care about 2 adj parameters which is different-->
<xsl:variable name="mark_used_by_typeid">
<xsl:if test="contains($typeid_adj, ',' )">
<xsl:value-of select="',' "/>
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 98cded028533..fb0b2863a8e8 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -235,7 +235,7 @@ private:
mbIsCalculatingInitialLayoutSize:1;
protected:
- bool mbIsDefferedInit;
+ bool mbIsDeferredInit;
VclPtr<vcl::Window> mpDialogParent;
private:
@@ -263,7 +263,7 @@ public:
void setOptimalLayoutSize();
SAL_DLLPRIVATE bool ImplStartDocking( const Point& rPos );
- SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; }
+ SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDeferredInit; }
virtual void doDeferredInit(WinBits nBits);
protected:
DockingWindow( WindowType nType );
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index b0528c8f8e4a..0153c876730c 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -167,12 +167,12 @@ private:
Idle maLayoutIdle;
OUString maNotebookBarUIFile;
protected:
- bool mbIsDefferedInit;
+ bool mbIsDeferredInit;
VclPtr<vcl::Window> mpDialogParent;
public:
using Window::ImplIsInTaskPaneList;
SAL_DLLPRIVATE bool ImplIsInTaskPaneList( vcl::Window* pWin );
- SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; }
+ SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDeferredInit; }
private:
SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window const * i_pConfigureWin );
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 774e08dfe0d3..5ff8d536f1a4 100644
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -40,7 +40,7 @@ interface XControl
[attribute] boolean Enabled;
[attribute] boolean Visible;
[attribute] long MousePointer;
- //Size. there are some defferent between Mso and OOo.
+ //Size. there are some different between Mso and OOo.
//Mso use double but OOo use long. OOo 1 = 1/100mm but Mso use pt.
//in Dialogs Mso uses pixels
[attribute] double Height;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index d77da75f23be..aa25bae8c74b 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -498,7 +498,7 @@ void Dialog::doDeferredInit(WinBits nBits)
VclPtr<vcl::Window> pParent = mpDialogParent;
mpDialogParent = nullptr;
ImplInit(pParent, nBits, mnInitFlag);
- mbIsDefferedInit = false;
+ mbIsDeferredInit = false;
}
Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription)
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index e96c3de183e9..e50bcf08f76b 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -297,7 +297,7 @@ void DockingWindow::ImplInitDockingWindowData()
mbRollUp = false;
mbDockBtn = false;
mbHideBtn = false;
- mbIsDefferedInit = false;
+ mbIsDeferredInit = false;
mbIsCalculatingInitialLayoutSize = false;
mpDialogParent = nullptr;
@@ -362,13 +362,13 @@ void DockingWindow::doDeferredInit(WinBits nBits)
vcl::Window *pParent = mpDialogParent;
mpDialogParent = nullptr;
ImplInit(pParent, nBits);
- mbIsDefferedInit = false;
+ mbIsDeferredInit = false;
}
void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
const css::uno::Reference<css::frame::XFrame> &rFrame)
{
- mbIsDefferedInit = true;
+ mbIsDeferredInit = true;
mpDialogParent = pParent; //should be unset in doDeferredInit
m_pUIBuilder.reset( new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID, rFrame) );
}
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index ddca40f52d5c..23e56ce6e669 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -175,7 +175,7 @@ void FloatingWindow::doDeferredInit(WinBits nBits)
vcl::Window *pParent = mpDialogParent;
mpDialogParent = nullptr;
ImplInit(pParent, nBits);
- mbIsDefferedInit = false;
+ mbIsDeferredInit = false;
}
void FloatingWindow::ApplySettings(vcl::RenderContext& rRenderContext)
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 80b5e6a0fa57..9c42fc94b2de 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -73,7 +73,7 @@ SystemWindow::SystemWindow(WindowType nType)
, mnMenuBarMode(MenuBarMode::Normal)
, mnIcon(0)
, mpImplData(new ImplData)
- , mbIsDefferedInit(false)
+ , mbIsDeferredInit(false)
{
mpWindowImpl->mbSysWin = true;
mpWindowImpl->mnActivateMode = ActivateModeFlags::GrabFocus;
@@ -87,7 +87,7 @@ SystemWindow::SystemWindow(WindowType nType)
void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
const css::uno::Reference<css::frame::XFrame> &rFrame)
{
- mbIsDefferedInit = true;
+ mbIsDeferredInit = true;
mpDialogParent = pParent; //should be unset in doDeferredInit
m_pUIBuilder.reset( new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID, rFrame) );
}
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 6d4a30470635..26579b2ddf98 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1305,7 +1305,7 @@ void ToolBox::doDeferredInit(WinBits nBits)
VclPtr<vcl::Window> pParent = mpDialogParent;
mpDialogParent = nullptr;
ImplInit(pParent, nBits);
- mbIsDefferedInit = false;
+ mbIsDeferredInit = false;
}
ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) :
More information about the Libreoffice-commits
mailing list