This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 7b2f5c2 Fixed typos, removed whitespace
7b2f5c2 is described below
commit 7b2f5c247fad6aaa1cc6bb50086b9b29658935b4
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Jan 11 15:11:19 2022 +0100
Fixed typos, removed whitespace
(cherry picked from commit b7d2c8470c348858b50b6ab6b047a8ef0f02195f)
---
.../ui/slidesorter/inc/view/SlideSorterView.hxx | 16 ++++++++--------
.../ui/slidesorter/inc/view/SlsButtonBar.hxx | 22 +++++++++++-----------
.../ui/slidesorter/inc/view/SlsILayerPainter.hxx | 20 ++++++++++----------
.../ui/slidesorter/inc/view/SlsInsertAnimator.hxx | 8 ++++----
.../inc/view/SlsInsertionIndicatorOverlay.hxx | 8 ++++----
.../source/ui/slidesorter/inc/view/SlsLayouter.hxx | 16 ++++++++--------
.../slidesorter/inc/view/SlsPageObjectLayouter.hxx | 14 +++++++-------
.../inc/view/SlsPageObjectViewContact.hxx | 16 ++++++++--------
.../inc/view/SlsPageObjectViewObjectContact.hxx | 20 ++++++++++----------
9 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 78c4e07..70a2707 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -78,7 +78,7 @@ public:
@param rViewShell
This reference is simply passed to the base class and not used
by this class.
-
+
*/
SlideSorterView (SlideSorter& rSlideSorter);
void Init (void);
@@ -161,7 +161,7 @@ public:
::boost::shared_ptr<cache::PageCache> GetPreviewCache (void);
/** Set the bounding box of the insertion marker in model coordinates.
-
+
It will be painted as a dark rectangle that fills the given box.
*/
void SetInsertionMarker (const Rectangle& rBBox);
@@ -171,7 +171,7 @@ public:
void SetInsertionMarkerVisibility (bool bVisible);
/** Set the size and position of the selection rectangle.
-
+
It will be painted as a dashed rectangle.
*/
void SetSelectionRectangle (const Rectangle& rBox);
@@ -235,7 +235,7 @@ public:
::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter (void);
::boost::shared_ptr<LayeredDevice> GetLayeredDevice (void) const;
-
+
class DrawLock
{
public:
diff --git a/main/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
index b4b88d6..56a16b0 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -63,7 +63,7 @@ public:
const model::SharedPageDescriptor& rpDescriptor,
const Point aMouseModelLocation,
const bool bIsMouseButtonDown);
-
+
void ResetPage (void);
/** Return the number of buttons that are to be displayed in page
@@ -74,7 +74,7 @@ public:
excluded from the slide show.
*/
sal_Int32 GetButtonCount (const bool bIsExcluded) const;
-
+
/** Return the specified button.
@param nIndex
Valid values lie in the range [0,GetButtonCount()).
@@ -128,8 +128,8 @@ public:
const model::SharedPageDescriptor& rpDescriptor,
const bool bAnimate);
- /** Return whether the button bar is visible for the givn descriptor (or
- being faded in.)
+ /** Return whether the button bar is visible for the given descriptor (or
+ being faded in).
*/
bool IsVisible (const model::SharedPageDescriptor& rpDescriptor);
@@ -139,7 +139,7 @@ public:
/** While at least one Lock object exists the button bar will not be
displayed. Used, e.g. during a mouse multiselection to avoid
- confusing and unhelpfull visual signals.
+ confusing and unhelpful visual signals.
*/
class Lock
{
@@ -149,7 +149,7 @@ public:
private:
ButtonBar& mrButtonBar;
};
-
+
private:
SlideSorter& mrSlideSorter;
Size maPageObjectSize;
@@ -173,7 +173,7 @@ private:
@return
The returned flag indicates whether the mpDescriptor member
is set to a new value.
- */
+ */
bool SetPage (const model::SharedPageDescriptor& rpDescriptor);
SharedButton GetButtonAt (const Point aModelLocation);
bool SetButtonUnderMouse (const SharedButton& rButton = SharedButton());
diff --git a/main/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
index 6d04bc8..8401dec 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -35,18 +35,18 @@ namespace sd { namespace slidesorter { namespace view {
class ILayerInvalidator
{
public:
- virtual void Invalidate (const Rectangle& rInvalidationBox) = 0;
+ virtual void Invalidate (const Rectangle& rInvalidationBox) = 0;
};
typedef ::boost::shared_ptr<ILayerInvalidator> SharedILayerInvalidator;
class ILayerPainter
{
public:
- virtual void SetLayerInvalidator (
- const SharedILayerInvalidator& rpInvalidator) = 0;
- virtual void Paint (
- OutputDevice& rDevice,
- const Rectangle& rRepaintArea) = 0;
+ virtual void SetLayerInvalidator (
+ const SharedILayerInvalidator& rpInvalidator) = 0;
+ virtual void Paint (
+ OutputDevice& rDevice,
+ const Rectangle& rRepaintArea) = 0;
};
typedef ::boost::shared_ptr<ILayerPainter> SharedILayerPainter;
diff --git a/main/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
index 452fa7b..4ca8d70 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git
a/main/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index 46fb962..7589fc4 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index d20f1f2..ca09e0d 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -44,7 +44,7 @@ class InsertPosition;
-/** Calculate the size and position of page objects displayed by a slide
+/** Calculate the size and position of page objects displayed by a slide
sorter. The layouter takes into account various input values:
1.) Size of the window in which the slide sorter is displayed.
2.) Desired and minimal and maximal widths of page objects.
@@ -58,7 +58,7 @@ class InsertPosition;
2.) The number of columns.
3.) The size of the enclosing page.
- <p>Sizes and lengths are all in pixel except where explicitly stated
+ <p>Sizes and lengths are all in pixel except where explicitly stated
otherwise.</p>
<p>The GetIndex... methods may return indices that are larger than or
@@ -106,7 +106,7 @@ public:
@param nMaximalColumnCount
The default value is 5.
*/
- void SetColumnCount (sal_Int32 nMinimalColumnCount,
+ void SetColumnCount (sal_Int32 nMinimalColumnCount,
sal_Int32 nMaximalColumnCount);
/** Central method of this class. It takes the input values and
@@ -241,7 +241,7 @@ private:
/** Collect all values concerning the logical and visual properties of the
- insertion position that is used for drag-and-drop and copy-and-past.
+ insertion position that is used for drag-and-drop and copy-and-paste.
*/
class InsertPosition
{
diff --git a/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 06355aa..7cdd359 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -78,7 +78,7 @@ public:
translation not in scale. Both relate to pixel values in the window.
A position in the model coordinate system does not change when the
window content is
scrolled up or down. In the window coordinate system (relative
- to the top left point of the window)scrolling leads to different
values.
+ to the top left point of the window) scrolling leads to different
values.
*/
enum CoordinateSystem {
WindowCoordinateSystem,
@@ -86,7 +86,7 @@ public:
};
/** Return the bounding box of the page object or one of its graphical
- parts.
+ parts.
@param rWindow
This device is used to translate between model and window
coordinates.
@@ -114,7 +114,7 @@ public:
const CoordinateSystem eCoordinateSystem);
Image GetTransitionEffectIcon (void) const;
-
+
private:
SharedSdWindow mpWindow;
Size maPageObjectSize;
diff --git
a/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
index 7c1db61..aaa13df 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -48,16 +48,16 @@ class PageObjectViewContact
{
public:
PageObjectViewContact (
- SdrPageObj& rPageObj,
+ SdrPageObj& rPageObj,
const model::SharedPageDescriptor& rpDescriptor);
~PageObjectViewContact (void);
/** Create a ViewObjectContact object that buffers its output in a
- bitmap.
+ bitmap.
@return
Ownership of the new object passes to the caller.
*/
- virtual ::sdr::contact::ViewObjectContact&
+ virtual ::sdr::contact::ViewObjectContact&
CreateObjectSpecificViewObjectContact(
::sdr::contact::ObjectContact& rObjectContact);
@@ -68,7 +68,7 @@ public:
virtual void ActionChanged (void);
protected:
- // create graphical visualisation data
+ // create graphical visualization data
virtual drawinglayer::primitive2d::Primitive2DSequence
createViewIndependentPrimitive2DSequence() const;
private:
diff --git
a/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
b/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
index 723ef46..0b4caa1 100644
--- a/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
+++ b/main/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -52,7 +52,7 @@ namespace sd { namespace slidesorter { namespace view {
class SlideSorterView;
/** This object-view-contact of page objects maintains a preview bitmap for
- the page to speed up redraws of the same. It does so by colaborating
+ the page to speed up redraws of the same. It does so by collaborating
with a cache of bitmaps (see ../cache).
*/
@@ -73,7 +73,7 @@ public:
preview is created every time when requested.
*/
PageObjectViewObjectContact (
- ::sdr::contact::ObjectContact& rObjectContact,
+ ::sdr::contact::ObjectContact& rObjectContact,
::sdr::contact::ViewContact& rViewContact,
const ::boost::shared_ptr<cache::PageCache>& rpCache,
const ::boost::shared_ptr<controller::Properties>& rpProperties);
@@ -153,7 +153,7 @@ public:
enum CoordinateSystem { ModelCoordinateSystem, PixelCoordinateSystem };
/** Return the bounding box of the page object or one of its graphical
- parts.
+ parts.
@param rDevice
This device is used to translate between model and window
coordinates.
@@ -169,10 +169,10 @@ public:
BoundingBoxType eType,
CoordinateSystem eCoordinateSystem) const;
- // create the graphical visualisation data
+ // create the graphical visualization data
virtual drawinglayer::primitive2d::Primitive2DSequence
createPrimitive2DSequence(const sdr::contact::DisplayInfo& rDisplayInfo) const;
- // access to the current page content primitive vector which may be used
for visualisation
+ // access to the current page content primitive vector which may be used
for visualization
const drawinglayer::primitive2d::Primitive2DSequence&
getCurrentPageContents() const { return mxCurrentPageContents; }
virtual void ActionChanged (void);
@@ -199,7 +199,7 @@ private:
bool mbInDestructor;
/// The primitive sequence of the page contents, completely scaled
- /// and prepared for painiting
+ /// and prepared for painting
drawinglayer::primitive2d::Primitive2DSequence mxCurrentPageContents;
::boost::shared_ptr<cache::PageCache> mpCache;
