[Libreoffice-commits] core.git: editeng/source framework/source include/editeng include/toolkit odk/examples sc/source sd/source
Tor Lillqvist
tml at collabora.com
Mon Feb 6 14:04:18 UTC 2017
editeng/source/outliner/outliner.cxx | 10 +++++-----
editeng/source/outliner/outlvw.cxx | 6 +++---
editeng/source/uno/unoforou.cxx | 2 +-
framework/source/jobs/helponstartup.cxx | 6 +++---
include/editeng/outliner.hxx | 4 ++--
include/toolkit/awt/vclxsystemdependentwindow.hxx | 6 +-----
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java | 2 +-
sc/source/ui/Accessibility/AccessibleCell.cxx | 4 ++--
sc/source/ui/inc/AccessibleCell.hxx | 2 +-
sd/source/ui/view/sdview.cxx | 2 +-
10 files changed, 20 insertions(+), 24 deletions(-)
New commits:
commit e1e4efdc71d00ab2255b311cd420f929384ebbfa
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 6 14:46:00 2017 +0200
Typo: s/dependend/dependent/i
Change-Id: If02798894ad6f0e0442ed60aaec6eca40e6dcb61
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index ca1bdf3..04db26f 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -256,7 +256,7 @@ void Outliner::SetDepth( Paragraph* pPara, sal_Int16 nNewDepth )
ImplCalcBulletText( nPara, false, false );
if ( ImplGetOutlinerMode() == OutlinerMode::OutlineObject )
- ImplSetLevelDependendStyleSheet( nPara );
+ ImplSetLevelDependentStyleSheet( nPara );
DepthChangedHdl(pPara, nPrevFlags);
}
@@ -685,10 +685,10 @@ void Outliner::ImplCheckNumBulletItem( sal_Int32 nPara )
pPara->aBulSize.Width() = -1;
}
-void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara )
+void Outliner::ImplSetLevelDependentStyleSheet( sal_Int32 nPara )
{
- DBG_ASSERT( ( ImplGetOutlinerMode() == OutlinerMode::OutlineObject ) || ( ImplGetOutlinerMode() == OutlinerMode::OutlineView ), "SetLevelDependendStyleSheet: Wrong Mode!" );
+ DBG_ASSERT( ( ImplGetOutlinerMode() == OutlinerMode::OutlineObject ) || ( ImplGetOutlinerMode() == OutlinerMode::OutlineView ), "SetLevelDependentStyleSheet: Wrong Mode!" );
SfxStyleSheet* pStyle = GetStyleSheet( nPara );
@@ -1932,10 +1932,10 @@ OUString Outliner::ImplGetBulletText( sal_Int32 nPara )
}
// this is needed for StarOffice Api
-void Outliner::SetLevelDependendStyleSheet( sal_Int32 nPara )
+void Outliner::SetLevelDependentStyleSheet( sal_Int32 nPara )
{
SfxItemSet aOldAttrs( pEditEngine->GetParaAttribs( nPara ) );
- ImplSetLevelDependendStyleSheet( nPara );
+ ImplSetLevelDependentStyleSheet( nPara );
pEditEngine->SetParaAttribs( nPara, aOldAttrs );
}
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 18c072b..bf061d3 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -536,7 +536,7 @@ void OutlinerView::Indent( short nDiff )
pOwner->ImplCalcBulletText( nPara, false, false );
if ( pOwner->ImplGetOutlinerMode() == OutlinerMode::OutlineObject )
- pOwner->ImplSetLevelDependendStyleSheet( nPara );
+ pOwner->ImplSetLevelDependentStyleSheet( nPara );
// Notify App
pOwner->DepthChangedHdl(pPara, nPrevFlags);
@@ -691,7 +691,7 @@ void OutlinerView::PasteSpecial()
const sal_Int32 nParaCount = pOwner->pEditEngine->GetParagraphCount();
for( sal_Int32 nPara = 0; nPara < nParaCount; nPara++ )
- pOwner->ImplSetLevelDependendStyleSheet( nPara );
+ pOwner->ImplSetLevelDependentStyleSheet( nPara );
}
pEditView->SetEditEngineUpdateMode( true );
@@ -1400,7 +1400,7 @@ sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EEText
}
if ( pOwner->ImplGetOutlinerMode() == OutlinerMode::OutlineObject )
- pOwner->ImplSetLevelDependendStyleSheet( n );
+ pOwner->ImplSetLevelDependentStyleSheet( n );
}
if ( eFormat != EE_FORMAT_BIN )
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 5a3f5f4..c41bdac 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -478,7 +478,7 @@ bool SvxOutlinerForwarder::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
// const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor::Default) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT);
if( bOutlinerText )
- rOutliner.SetLevelDependendStyleSheet( nPara );
+ rOutliner.SetLevelDependentStyleSheet( nPara );
return true;
}
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 6a0cc10..9996c85 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -132,14 +132,14 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea
if (bShowIt)
{
// retrieve the help URL for the detected application module
- OUString sModuleDependendHelpURL = its_checkIfHelpEnabledAndGetURL(sModule);
- if (!sModuleDependendHelpURL.isEmpty())
+ OUString sModuleDependentHelpURL = its_checkIfHelpEnabledAndGetURL(sModule);
+ if (!sModuleDependentHelpURL.isEmpty())
{
// Show this help page.
// Note: The help window brings itself to front ...
Help* pHelp = Application::GetHelp();
if (pHelp)
- pHelp->Start(sModuleDependendHelpURL, nullptr);
+ pHelp->Start(sModuleDependentHelpURL, nullptr);
}
}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index fea6253..ef1540e 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -641,7 +641,7 @@ private:
OUString ImplGetBulletText( sal_Int32 nPara );
void ImplCheckNumBulletItem( sal_Int32 nPara );
void ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo );
- void ImplSetLevelDependendStyleSheet( sal_Int32 nPara );
+ void ImplSetLevelDependentStyleSheet( sal_Int32 nPara );
void ImplBlockInsertionCallbacks( bool b );
@@ -954,7 +954,7 @@ public:
const EditEngine& GetEditEngine() const;
// this is needed for StarOffice Api
- void SetLevelDependendStyleSheet( sal_Int32 nPara );
+ void SetLevelDependentStyleSheet( sal_Int32 nPara );
OutlinerMode GetOutlinerMode() const { return nOutlinerMode; }
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index d136d50..64bbe35 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -28,10 +28,6 @@
#include <toolkit/awt/vclxwindow.hxx>
-
-// class VCLXSystemDependendtWindow
-
-
class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public css::awt::XSystemDependentWindowPeer,
public VCLXWindow
{
@@ -48,7 +44,7 @@ public:
css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
- // css::awt::XSystemDependendtWindowPeer
+ // css::awt::XSystemDependentWindowPeer
css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override;
};
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
index 43b3d98..f91f7d8 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
@@ -198,7 +198,7 @@ public class DocumentView extends JFrame
/**
* Create the view frame for showing the office documents on demand.
- * Dependend from given command line parameter we create
+ * Depending on given command line parameter we create
* an office XFrame and initialize it with a window. This
* window can be a pure toolkit window (means toolkit of office!)
* or a plugged java canvas - office window combination.
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 1ed01b3..ab273e3 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -286,7 +286,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
pRelationSet = mpAccDoc->GetRelationSet(&maCellAddress);
if (!pRelationSet)
pRelationSet = new utl::AccessibleRelationSetHelper();
- FillDependends(pRelationSet);
+ FillDependents(pRelationSet);
FillPrecedents(pRelationSet);
return pRelationSet;
}
@@ -392,7 +392,7 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell)
return pEditSource;
}
-void ScAccessibleCell::FillDependends(utl::AccessibleRelationSetHelper* pRelationSet)
+void ScAccessibleCell::FillDependents(utl::AccessibleRelationSetHelper* pRelationSet)
{
if (mpDoc)
{
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index 68adf6c..ec9a125 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -152,7 +152,7 @@ private:
::std::unique_ptr< SvxEditSource > CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos);
- void FillDependends(utl::AccessibleRelationSetHelper* pRelationSet);
+ void FillDependents(utl::AccessibleRelationSetHelper* pRelationSet);
void FillPrecedents(utl::AccessibleRelationSetHelper* pRelationSet);
void AddRelation(const ScAddress& rCell,
const sal_uInt16 aRelationType,
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 2ff577a..34d3ae3 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1208,7 +1208,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfo )
SdPage* pPage = static_cast< SdPage* >( pTextObj->GetPage() );
const PresObjKind eKind = pPage->GetPresObjKind(pTextObj);
- // outline kinds are taken care of in Outliner::ImplSetLevelDependendStyleSheet
+ // outline kinds are taken care of in Outliner::ImplSetLevelDependentStyleSheet
if( eKind == PRESOBJ_OUTLINE )
return;
More information about the Libreoffice-commits
mailing list