diff options
| -rw-r--r-- | .vscode/vs-code-template.code-workspace.in | 2 | ||||
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 2 | ||||
| -rw-r--r-- | odk/examples/DevelopersGuide/UCB/ResourceManager.java | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/diagram/diagramhelper.cxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/diagram/diagramhelper.hxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/.vscode/vs-code-template.code-workspace.in b/.vscode/vs-code-template.code-workspace.in index 479bff58035e..f6078155e8dc 100644 --- a/.vscode/vs-code-template.code-workspace.in +++ b/.vscode/vs-code-template.code-workspace.in @@ -164,7 +164,7 @@ "MIMode": "lldb", "setupCommands": [ { - "description": "load helpers for for lldb", + "description": "load helpers for lldb", "text": "command script import ${workspaceFolder:srcdir}/solenv/lldb/libreoffice/LO.py", "ignoreFailures": false } diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index dc2a06a78b56..734e805ccac5 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -395,7 +395,7 @@ private: bool mbUseBgFill = false; // temporary space for DiagramHelper in preparation for collecting data - // Note: I tried to use a unique_ptr here, but existing constuctor func does not allow that + // Note: I tried to use a unique_ptr here, but existing constructor func does not allow that IDiagramHelper* mpDiagramHelper; }; diff --git a/odk/examples/DevelopersGuide/UCB/ResourceManager.java b/odk/examples/DevelopersGuide/UCB/ResourceManager.java index 6c6b8d6e2a20..61d64c8c0260 100644 --- a/odk/examples/DevelopersGuide/UCB/ResourceManager.java +++ b/odk/examples/DevelopersGuide/UCB/ResourceManager.java @@ -153,7 +153,7 @@ public class ResourceManager { /** * Get transferring Operation. * - *@return String That contains the trasfering Operation + *@return String That contains the transferring Operation */ public String getTransOperation() { return m_transOperation; diff --git a/oox/source/drawingml/diagram/diagramhelper.cxx b/oox/source/drawingml/diagram/diagramhelper.cxx index f3792b295f7e..b61c6b12994a 100644 --- a/oox/source/drawingml/diagram/diagramhelper.cxx +++ b/oox/source/drawingml/diagram/diagramhelper.cxx @@ -82,7 +82,7 @@ void AdvancedDiagramHelper::reLayout(SdrObjGroup& rTarget) // For re-creation we need to use ::addShape functionality from the // oox import filter since currently Shape import is very tightly // coupled to Shape creation. It converts a oox::Shape representation - // combined with an oox::Theme to incarrnated XShapes representing the + // combined with an oox::Theme to incarnated XShapes representing the // Diagram. // To use that functionality, we have to create a temporary filter // (based on ShapeFilterBase). Problems are that this needs to know diff --git a/oox/source/drawingml/diagram/diagramhelper.hxx b/oox/source/drawingml/diagram/diagramhelper.hxx index 76dffdb88f5a..0c1240bdd4ba 100644 --- a/oox/source/drawingml/diagram/diagramhelper.hxx +++ b/oox/source/drawingml/diagram/diagramhelper.hxx @@ -30,12 +30,12 @@ class Diagram; // Advanced DiagramHelper // -// This helper tries to hold all neccessary data to re-layout +// This helper tries to hold all necessary data to re-layout // all XShapes/SdrObjects of an already imported Diagram. The // Diagram holds the SmarArt model data before it gets layouted, // while Theme holds the oox Fill/Line/Style definitions to // apply. -// Re-Layouting (re-reating) is rather complex, for detailed +// Re-Layouting (re-creating) is rather complex, for detailed // information see ::reLayout implementation. // This helper class may/should be extended to: // - deliver representative data from the Diagram-Model diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 0192ff8aa3de..ac2ff8891add 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -205,7 +205,7 @@ void Shape::prepareDiagramHelper( const std::shared_ptr< Diagram >& rDiagramPtr, const std::shared_ptr<::oox::drawingml::Theme>& rTheme) { - // Prepare Diagam data collecting for this Shape + // Prepare Diagram data collecting for this Shape if( nullptr == mpDiagramHelper && FRAMETYPE_DIAGRAM == meFrameType ) { mpDiagramHelper = new AdvancedDiagramHelper(rDiagramPtr, rTheme, *this); diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 7cac9f292afb..56c86eaa10ff 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2648,7 +2648,7 @@ void WW8PLCFx_Fc_FKP::WW8Fkp::FillEntry(WW8PLCFx_Fc_FKP::WW8Fkp::Entry &rEntry, } const sal_uInt16 nAvailableData = sizeof(maRawData)-nDataOffset; - OSL_ENSURE(nLen <= nAvailableData, "srpm sequence len is out of range, clipping"); + OSL_ENSURE(nLen <= nAvailableData, "sprm sequence len is out of range, clipping"); rEntry.mnLen = std::min(nLen, nAvailableData); rEntry.mpData = maRawData + nDataOffset; } |