[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 4 commits - include/drawinglayer include/editeng include/i18nlangtag include/LibreOfficeKit include/linguistic include/o3tl include/oox libreofficekit/qa sd/source
Tor Lillqvist
tml at collabora.com
Tue Oct 13 05:52:32 PDT 2015
include/LibreOfficeKit/LibreOfficeKit.hxx | 2 -
include/LibreOfficeKit/LibreOfficeKitEnums.h | 11 ++------
include/drawinglayer/primitive2d/baseprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/cropprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/maskprimitive2d.hxx | 4 +-
include/drawinglayer/primitive2d/sceneprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/structuretagprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/transformprimitive2d.hxx | 2 -
include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx | 2 -
include/drawinglayer/processor2d/baseprocessor2d.hxx | 2 -
include/drawinglayer/texture/texture.hxx | 2 -
include/editeng/hangulhanja.hxx | 6 ++--
include/i18nlangtag/lang.h | 4 +-
include/linguistic/misc.hxx | 2 -
include/o3tl/sorted_vector.hxx | 2 -
include/oox/ole/axcontrol.hxx | 2 -
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 9 ------
sd/source/ui/unoidl/unomodel.cxx | 15 -----------
18 files changed, 25 insertions(+), 48 deletions(-)
New commits:
commit 6637b467784cffeb516a9a1ec1cab5679d70ae14
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jun 15 12:37:27 2015 +0300
Typo
Change-Id: Ibecfa73dd1b865edba77caf51f5003d1b18692be
(cherry picked from commit a0e10b1e0863b1967ede25053f8e3f1dacf0fbdf)
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index da94181..0da8769 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -119,7 +119,7 @@ typedef enum
* document, the status indicator callbacks will arrive to the callback
* registered for the LibreOfficeKit (singleton) object, not a
* LibreOfficeKitDocument one, because we are in the very progress of
- * loading a docuemnt and then constructing a LibreOfficeKitDocument
+ * loading a document and then constructing a LibreOfficeKitDocument
* object.
*/
LOK_CALLBACK_STATUS_INDICATOR_START,
commit 31f6423d9a6f6207ed68319d17a60ea6a4405cc0
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Sep 29 17:54:40 2015 +0200
Fix typos
Change-Id: I6dfb5fb468c1305a8f248bf5788c5760135fd835
Reviewed-on: https://gerrit.libreoffice.org/18955
Reviewed-by: Oliver Specht <oliver.specht at cib.de>
Tested-by: Oliver Specht <oliver.specht at cib.de>
(cherry picked from commit d344d2b1f5e528c5f2a2d6b892a23e402aa4bd46)
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index e9167c5..72231ad 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -68,7 +68,7 @@ public:
/**
* Get number of part that the document contains.
*
- * Part refers to either indivual sheets in a Calc, or slides in Impress,
+ * Part refers to either individual sheets in a Calc, or slides in Impress,
* and has no relevance for Writer.
*/
inline int getParts()
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index f72ff91..7f0e00a 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -119,7 +119,7 @@ namespace drawinglayer
For primitive identification, getPrimitiveID is used currently in this implementations
to allow a fast switch/case processing. This needs a unique identifier mechanism which
- currently uses defines (see drawinglayer_primitivetypes2d.hxx). For UNO prmitive API
+ currently uses defines (see drawinglayer_primitivetypes2d.hxx). For UNO primitive API
it will be needed to add a unique descriptor (Name?) later to the API.
This base implementation provides mappings from the methods from XPrimitive2D
diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
index 01c6349..bf6a8e5 100644
--- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
@@ -35,7 +35,7 @@ namespace drawinglayer
Caution: Due to old constraints (old core definitions) the
crop distances describe how the uncropped content is defined
relative to the current object size. This means that maTransformation
- describes the rurrent object size (the part of the object visible
+ describes the current object size (the part of the object visible
with the crop applied). To get the original size and orientation
of the uncropped content it is necessary to calc back from the
current situation (maTransformation) using the crop values
diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
index b7b2e10..1e74b82 100644
--- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
@@ -40,9 +40,9 @@ namespace drawinglayer
This primitive should be handled by a renderer. If it is not handled,
it decomposes to its Child content, and thus the visualisation would
- contaiun no clips.
+ contain no clips.
- The geometrc range of this primitive is completely defined by the Mask
+ The geometry range of this primitive is completely defined by the Mask
tools::PolyPolygon since by definition nothing outside of the mask is visible.
*/
class DRAWINGLAYER_DLLPUBLIC MaskPrimitive2D : public GroupPrimitive2D
diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
index a4109b6..c5a9cde 100644
--- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
@@ -105,7 +105,7 @@ namespace drawinglayer
public:
/// public helpers
/** Geometry extractor. Shadow will be added as in create2DDecomposition, but
- the 3D content is not converted to a bitmap visualisation but to projected 2D gemetry. This
+ the 3D content is not converted to a bitmap visualisation but to projected 2D geometry. This
helper is useful e.g. for Contour extraction or HitTests.
*/
Primitive2DSequence getGeometry2D() const;
diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
index 60409dd..1e6115b 100644
--- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
@@ -33,7 +33,7 @@ namespace drawinglayer
{
/** StructureTagPrimitive2D class
- This class is used to provode simple support for adding grouped
+ This class is used to provide simple support for adding grouped
pdf writer structured element information like used in sd from
unomodel.cxx where a ViewObjectContactRedirector is used to add
such information for diverse objects.
diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx
index efc9fa3..7656bddb 100644
--- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx
@@ -43,7 +43,7 @@ namespace drawinglayer
It does transform by embedding an existing geometry into a
transformation as Child-content. This allows re-usage of the
- refcounted Uno-Api primitives and their existung, buffered
+ refcounted Uno-Api primitives and their existing, buffered
decompositions.
It could e.g. be used to show a single object geometry in 1000
diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index efb179a..069f88b 100644
--- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
@@ -42,7 +42,7 @@ namespace drawinglayer
/** SliceType3D definition */
enum SliceType3D
{
- SLICETYPE3D_REGULAR, // normal geoemtry Slice3D
+ SLICETYPE3D_REGULAR, // normal geometry Slice3D
SLICETYPE3D_FRONTCAP, // front cap
SLICETYPE3D_BACKCAP // back cap
};
diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx
index 4f9eedf..fe6e9a8 100644
--- a/include/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -132,7 +132,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_SOME_TEXT :
{
- // encapsulate e.g. with changing local varibles, e.g.
+ // encapsulate e.g. with changing local variables, e.g.
// sometimes it's good to know if a basic primitive is
// part of a text, especially when not handling the text
// self but by purpose want to handle the decomposed
diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx
index daa0348..118ab88 100644
--- a/include/drawinglayer/texture/texture.hxx
+++ b/include/drawinglayer/texture/texture.hxx
@@ -327,7 +327,7 @@ namespace drawinglayer
// tile a matrix will be created (by appendTransformations) that
// represents the needed transformation to map a filling in unit
// coordinates to that tile.
- // When offsetX is given, every 2nd line will be ofsetted by the
+ // When offsetX is given, every 2nd line will be offsetted by the
// given percentage value (offsetX has to be 0.0 <= offsetX <= 1.0).
// Accordingly to offsetY. If both are given, offsetX is preferred
// and offsetY is ignored.
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index 5f9f16f..bc784c2 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -60,7 +60,7 @@ namespace editeng
{
eExchange, // simply exchange one text with another
eReplacementBracketed, // keep the original, and put the replacement in brackets after it
- eOriginalBracketed, // replace the original text, but put it in brackeds after the replacement
+ eOriginalBracketed, // replace the original text, but put it in brackets after the replacement
eReplacementAbove, // keep the original, and put the replacement text as ruby text above it
eOriginalAbove, // replace the original text, but put it as ruby text above it
eReplacementBelow, // keep the original, and put the replacement text as ruby text below it
@@ -98,7 +98,7 @@ namespace editeng
::std::unique_ptr< HangulHanjaConversion_Impl > m_pImpl;
// used to set initial values of m_pImpl object from saved ones
- static bool m_bUseSavedValues; // defines if the followng two values should be used for initialization
+ static bool m_bUseSavedValues; // defines if the following two values should be used for initialization
static bool m_bTryBothDirectionsSave;
static ConversionDirection m_ePrimaryConversionDirectionSave;
@@ -220,7 +220,7 @@ namespace editeng
@param _rOrigText
the original text to be replaced (as returned by GetNextPortion).
Since in Chinese conversion the original text is needed as well
- in order to only do the minimal necassry text changes and to keep
+ in order to only do the minimal necessary text changes and to keep
as much attributes as possible this is supplied here as well.
@param _rReplaceWith
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 0a87972..a513dfc 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -71,8 +71,8 @@
! (sic!), or strange things like 'ar-Ploc-SA' and 'ja-Ploc-JP' ('Ploc'??).
!
! Use THAT ^^^ as the ultimate reference source (haha?) as of 2013-10-17 it
- ! inludes also Windows 8.1 (Release: Monday, July 22, 2013; well, its table
- ! says 08/08/2013 Revision 6.0, but hey, who cares ...)
+ ! includes also Windows 8.1 (Release: Monday, July 22, 2013; well, its table
+ ! says 08/08/2013 Revision 6.0, but hey, who cares...)
For completeness, you can never have enough lists:
List of supported locale identifiers in Word
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 56e7cb2..2c2c8f0 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -68,7 +68,7 @@ enum class DictionaryError
NONE, FULL, READONLY, UNKNOWN, NOT_EXISTS
};
-// values asigned to capitalization types
+// values assigned to capitalization types
enum class CapType
{
UNKNOWN,
diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx
index 328b101..a2267c0 100644
--- a/include/o3tl/sorted_vector.hxx
+++ b/include/o3tl/sorted_vector.hxx
@@ -17,7 +17,7 @@
namespace o3tl
{
-// forward declared because it's default tempate arg for sorted_vector
+// forward declared because it's default template arg for sorted_vector
template<class Value, class Compare>
struct find_unique;
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 1a5f24b..6160c16 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -689,7 +689,7 @@ class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase
public:
explicit AxOptionButtonModel();
- /** Returns the group name used to goup several option buttons gogether. */
+ /** Returns the group name used to goup several option buttons together. */
const OUString& getGroupName() const { return maGroupName; }
virtual ApiControlType getControlType() const SAL_OVERRIDE;
commit d65ba249edfb1b564aebd8dab7af87ed1a176594
Author: Pranav Kant <pranavk at gnome.org>
Date: Fri Jun 5 16:36:14 2015 +0530
LOK: fix the rectangle format mentioned in documentation/comment
Change-Id: I41bf3a21b5da9fc8155bbe6eb0f86078f90f6647
(cherry picked from commit 107d31165479d602fbc644aaf41d213e58e00389)
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 2726124..da94181 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -39,7 +39,7 @@ typedef enum
* Any tiles which are over the rectangle described in the payload are no
* longer valid.
*
- * Rectangle format: "width, height, x, y", where all numbers are document
+ * Rectangle format: "x, y, width, height", where all numbers are document
* coordinates, in twips. When all tiles are supposed to be dropped, the
* format is the "EMPTY" string.
*/
commit 8486ec3464e54f13760af3048249aaab642ac16b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri May 22 12:14:36 2015 +0100
LOK: remove unused LOK_PARTMODE_EMBEDDEDOBJ
Change-Id: I8cbb5b7a134fb84bd2c363b06f06f7f40964521f
(cherry picked from commit 39321c5ffa9b4196308575be6dd19f2b2924214f)
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index fbe3c1b..2726124 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -28,11 +28,8 @@ LibreOfficeKitDocumentType;
typedef enum
{
- LOK_PARTMODE_DEFAULT,
- LOK_PARTMODE_SLIDE,
- LOK_PARTMODE_NOTES,
- LOK_PARTMODE_SLIDENOTES,
- LOK_PARTMODE_EMBEDDEDOBJ
+ LOK_PARTMODE_SLIDES,
+ LOK_PARTMODE_NOTES
}
LibreOfficeKitPartMode;
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 2e6474e..172648b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -319,11 +319,8 @@ static void changePart( GtkWidget* pSelector, gpointer /* pItem */ )
static void populatePartModeSelector( GtkComboBoxText* pSelector )
{
- gtk_combo_box_text_append_text( pSelector, "Default" );
- gtk_combo_box_text_append_text( pSelector, "Slide" );
+ gtk_combo_box_text_append_text( pSelector, "Standard" );
gtk_combo_box_text_append_text( pSelector, "Notes" );
- gtk_combo_box_text_append_text( pSelector, "Combined (SlideNotes)" );
- gtk_combo_box_text_append_text( pSelector, "Embedded Objects" );
gtk_combo_box_set_active( GTK_COMBO_BOX(pSelector), 0 );
}
@@ -338,10 +335,6 @@ static void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ )
{
lok_docview_set_partmode( LOK_DOCVIEW(pDocView), ePartMode );
}
-
- // The number of items could change e.g. if we change from slide
- // to embeddede obj mode -- hence we should update the part list.
- populatePartSelector();
}
#endif
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index b8be619..6ae01a2 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2347,22 +2347,9 @@ void SdXImpressDocument::setPartMode( int nPartMode )
PageKind aPageKind( PK_STANDARD );
switch ( nPartMode )
{
- case LOK_PARTMODE_EMBEDDEDOBJ:
- // This will probably be handled higher up, i.e.
- // we probably shouldn't be handling this here.
- // (However we don't offer embedded object-only
- // rendering anywhere yet, so this may be a
- // completely incorrect comment.)
- assert( false );
- // And let's fall through in a normal build.
- case LOK_PARTMODE_DEFAULT:
- case LOK_PARTMODE_SLIDE:
- break;
- case LOK_PARTMODE_SLIDENOTES:
- aPageKind = PK_NOTES;
+ case LOK_PARTMODE_SLIDES:
break;
case LOK_PARTMODE_NOTES:
- // TODO: this shows combined slides + notes
aPageKind = PK_NOTES;
break;
}
More information about the Libreoffice-commits
mailing list