reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
| 2 +-
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
| 2 +-
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
| 2 +-
reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
| 2 +-
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
| 6 +++---
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
| 2 +-
reportdesign/source/ui/inc/GroupsSorting.hxx
| 2 +-
reportdesign/source/ui/inc/ReportController.hxx
| 2 +-
rsc/inc/rscarray.hxx
| 2 +-
rsc/inc/rscrange.hxx
| 2 +-
rsc/inc/rsctop.hxx
| 4 ++--
rsc/source/res/rscclass.cxx
| 2 +-
rsc/source/rscpp/cpp.h
| 2 +-
rsc/source/rscpp/cpp1.c
| 4 ++--
rsc/source/rscpp/cpp2.c
| 2 +-
15 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit d721cc515b1056226c562b2d85870da6f69180a4
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
Date: Tue Sep 29 17:56:36 2015 +0200
Fix typos
Change-Id: I8f4500fc7a901c5cc73634ba6da6b9541452e5ae
Reviewed-on: https://gerrit.libreoffice.org/18966
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
index e3dde73..dd2b480 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
@@ -47,7 +47,7 @@ public class InputRepositoryResourceData extends
AbstractResourceData
public Object getAttribute(final String key)
{
- // we dont support attributes here ..
+ // we don't support attributes here ..
return null;
}
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
index 71562ca..90647e4 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
@@ -80,7 +80,7 @@ public class OfficeStylesCollection extends Element
}
// And later: Autogenerate one of the default styles.
- // However, at this moment, we dont have a clue about the default
styles
+ // However, at this moment, we don't have a clue about the default
styles
// at all. Maybe we should add them to make this implementation more
robust
// against invalid documents.
return null;
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index eef2178..2889a8f 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -1401,7 +1401,7 @@ public abstract class OfficeDocumentReportTarget extends
AbstractReportTarget
imageAreaHeightVal =
CSSNumericValue.createValue(imageAreaHeightVal.getType(), ret[1]);
}
}
- // If we do scale, then we simply use the given
image-area-size as valid image size and dont
+ // If we do scale, then we simply use the given
image-area-size as valid image size and don't
// care about the image itself ..
}
else
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
index 8ba9231..db8fe0f 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
@@ -174,7 +174,7 @@ public class StyleUtilities
stylesCollection.getStyle(styleFamily, styleParent);
if (inherited != null)
{
- // OK, recurse (and hope that we dont run into an infinite
loop) ..
+ // OK, recurse (and hope that we don't run into an infinite
loop) ..
copyStyle(styleFamily, styleParent, stylesCollection,
commonCollection, predefCollection,
inheritanceTracker);
}
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
index 3f3fe44..469e5ef 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
@@ -346,7 +346,7 @@ public class TextRawReportTarget extends
OfficeDocumentReportTarget
// derive section style ..
// This is a rather cheap solution to the problem. In a sane world, we
would have to feed the
- // footer multiple times. Right now, we simply rely on the balacing,
which should make sure that
+ // footer multiple times. Right now, we simply rely on the balancing,
which should make sure that
// the column's content are evenly distributed.
final XmlWriter writer = getXmlWriter();
final AttributeList attrs = new AttributeList();
@@ -1014,7 +1014,7 @@ public class TextRawReportTarget extends
OfficeDocumentReportTarget
}
if (getCurrentRole() == ROLE_TEMPLATE || getCurrentRole() ==
ROLE_SPREADSHEET_PAGE_HEADER || getCurrentRole() ==
ROLE_SPREADSHEET_PAGE_FOOTER)
{
- // the template section would break the multi-column stuff and we
dont open up sections there
+ // the template section would break the multi-column stuff and we
don't open up sections there
// anyway ..
return;
}
@@ -1040,7 +1040,7 @@ public class TextRawReportTarget extends
OfficeDocumentReportTarget
sectionHeight = new LengthCalculator();
if (role == OfficeDocumentReportTarget.ROLE_TEMPLATE || role ==
OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_HEADER || role ==
OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_FOOTER)
{
- // Start buffering with an dummy styles-collection, so that the
global styles dont get polluted ..
+ // Start buffering with an dummy styles-collection, so that the
global styles don't get polluted ..
startBuffering(new OfficeStylesCollection(), true);
}
else if (role == OfficeDocumentReportTarget.ROLE_PAGE_HEADER)
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
index 5a6356a..03cd8f9 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
@@ -69,7 +69,7 @@ public class FormattedTextReadHandler extends
ElementReadHandler
// * Print-When-Section-Overflows
// That property cannot be evaluated yet, as this would require us to
- // have a clue about pagebreaking. We dont have that - not yet and
never
+ // have a clue about pagebreaking. We don't have that - not yet and
never
// in the future, as pagebreaks are computed by OpenOffice instead
}
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx
b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 714191c..3b3fd60 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -126,7 +126,7 @@ private:
*/
void displayGroup(const ::com::sun::star::uno::Reference<
::com::sun::star::report::XGroup>& _xGroup);
- /** enables or diables the up and down button
+ /** enables or disables the up and down button
@param _nRow the row which will be active
*/
void checkButtons(sal_Int32 _nRow);
diff --git a/reportdesign/source/ui/inc/ReportController.hxx
b/reportdesign/source/ui/inc/ReportController.hxx
index e48f9cc..e9434e3 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -343,7 +343,7 @@ namespace rptui
// SfxListener
virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
SAL_OVERRIDE;
- /** returns <TRUE/> when the command is enbaled
+ /** returns <TRUE/> when the command is enabled
@param _nCommand the command id
@param _xControlFormat the report control format
*/
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 65a74e9..1b7fc3b 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -49,7 +49,7 @@ struct RscArrayInst
RscInstNode * pNode;
};
-/* The tree is sorted against its enum value, not gainst its HashId */
+/* The tree is sorted against its enum value, not against its HashId */
class RscArray : public RscTop
{
protected:
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 4739b57..e34533b 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -77,7 +77,7 @@ public:
RscLongRange( Atom nId, sal_uInt32 nTypId );
virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE;
RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool )
SAL_OVERRIDE;
- // sets the alloed range
+ // sets the allowed range
ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum );
// returns the class size in bytes
sal_uInt32 Size() SAL_OVERRIDE { return nSize; }
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index f94f574..43b32ca 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -123,7 +123,7 @@ public:
// returns instance at the position
virtual RSCINST GetPosEle( const RSCINST & rInst, sal_uInt32 nPos );
- // smove an instance
+ // move an instance
virtual ERRTYPE MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
sal_uInt32 nSourcePos );
@@ -163,7 +163,7 @@ public:
virtual RSCINST Create( RSCINST * pInst,
const RSCINST & rDefInst, bool bOwnClass = false );
- // detroys instance
+ // destroys instance
virtual void Destroy( const RSCINST & rInst );
// checks consistency
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index a7c63b8..a167552 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -773,7 +773,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST &
rInst, RscWriteRc & rMem
ERRTYPE aError;
RSCINST aFileName;
- // retriebe instance with file name "FILENAME"
+ // retrieve instance with file name "FILENAME"
aFileName = RscClass::GetCopyVar( rInst, pHS->getID( "FILE", true ) );
if( aFileName.IsInst() )
{
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
index d0432ed..927f1ba 100644
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.h
@@ -40,7 +40,7 @@ extern FILE* pDefOut; /* ER
*/
#define EOS '\0' /* End of string */
#define EOF_CHAR 0 /* Returned by get() on eof */
-#define NULLST ((char *) NULL) /* Pointer to nowhere (linted) */
+#define NULLST ((char *) NULL) /* Pointer to nowhere (linked) */
#define DEF_NOARGS (-1) /* #define foo vs #define foo() */
/*
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index 7f4e079..02fcb4e 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -94,14 +94,14 @@ int rec_recover = TRUE; /* Unwind recursive macros
*/
* shouldn't delimit tokens, but we'll worry about that some other
* time -- it is more important to prevent infinitly long output lines.
*
- * instring and inmarcor are parameters to the get() routine which
+ * instring and inmacro are parameters to the get() routine which
* were made global for speed.
*/
int instring = FALSE; /* TRUE if scanning string */
int inmacro = FALSE; /* TRUE if #defining a macro */
/*
- * work[] and workp are used to store one piece of text in a temporay
+ * work[] and workp are used to store one piece of text in a temporary
* buffer. To initialize storage, set workp = work. To store one
* character, call save(c); (This will fatally exit if there isn't
* room.) To terminate the string, call save(EOS). Note that
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index 2c2e550..2108f09 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -373,7 +373,7 @@ FILE_LOCAL void doinclude()
#ifdef CONTROL_COMMENTS_NOT_ALLOWED
while ((c = get()) != '\n' && c != EOF_CHAR)
save(c); /* Put it away. */
- unget(); /* Force nl after includee */
+ unget(); /* Force nl after include */
/*
* The draft is unclear if the following should be done.
*/
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
