[Libreoffice-commits] core.git: 3 commits - cli_ure/readme.txt dbaccess/source desktop/source desktop/test lotuswordpro/source qadevOOo/runner sc/source solenv/bin svx/source sw/source vcl/quartz
Julien Nabet
serval2412 at yahoo.fr
Tue Feb 24 14:46:09 PST 2015
cli_ure/readme.txt | 2 +-
dbaccess/source/ui/inc/QueryViewSwitch.hxx | 2 +-
desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 2 +-
desktop/test/deployment/update/publisher/readme.txt | 8 ++++----
desktop/test/deployment/update/readme.txt | 4 ++--
lotuswordpro/source/filter/lwpfrib.cxx | 2 +-
lotuswordpro/source/filter/lwppagelayout.cxx | 2 +-
lotuswordpro/source/filter/lwpstory.cxx | 2 +-
qadevOOo/runner/helper/ProcessHandler.java | 2 +-
sc/source/filter/inc/xestring.hxx | 2 +-
solenv/bin/modules/installer/windows/media.pm | 4 ++--
svx/source/inc/fmshimp.hxx | 2 +-
sw/source/uibase/inc/usrpref.hxx | 2 +-
vcl/quartz/ctlayout.cxx | 2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 03d145d882b1f5d7049119672c28a204f62159d0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Feb 24 23:44:51 2015 +0100
Typo: alludpatelastsequences->allupdatelastsequences
Change-Id: I902fcb3fef7100279c34494e95cacfd3e5caf153
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index caed95e..3e6f429 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -112,7 +112,7 @@ sub get_maximum_filenumber
sub create_media_table
{
- my ($filesref, $basedir, $allvariables, $alludpatelastsequences, $allupdatediskids) = @_;
+ my ($filesref, $basedir, $allvariables, $allupdatelastsequences, $allupdatediskids) = @_;
my @mediatable = ();
commit 8577f2f35eb23e5320e01c61344b0ad05e058814
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Feb 24 23:42:28 2015 +0100
Typos
Change-Id: I5f2577dd1f047331a58d33e05684b673e6dbd11e
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index 265ad78..a945da5 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
@@ -75,7 +75,7 @@ namespace dbaui
bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo );
void GrabFocus();
- // returs the add table dialog from the design view
+ // returns the add table dialog from the design view
OAddTableDlg* getAddTableDialog();
OQueryDesignView* getDesignView() const { return m_pDesignView; }
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index a6a61df..1ae8ba2 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -149,7 +149,7 @@ public:
returns the download website URL from the update information.
There can be multiple URLs where each is assigned to a particular locale.
- The function returs the URL which locale matches best the one used in the office.
+ The function returns the URL which locale matches best the one used in the office.
The return value is an optional because it may be necessary to find out if there
was a value provided or not. This is necessary to flag the extension in the update dialog
diff --git a/desktop/test/deployment/update/publisher/readme.txt b/desktop/test/deployment/update/publisher/readme.txt
index 1a659d8..92875e0 100644
--- a/desktop/test/deployment/update/publisher/readme.txt
+++ b/desktop/test/deployment/update/publisher/readme.txt
@@ -56,7 +56,7 @@ Repository:
-Create the new extension in the repository.
-Provide a company name and a URL to the company website. This setting should be ignored
- when generating the udpate feed. Instead the publisher name from the extension is used.
+ when generating the update feed. Instead the publisher name from the extension is used.
Enter "Publisher Title" : some arbitrary company
"Publisher URL": any arbitrary URL but not:
http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US.html
@@ -103,7 +103,7 @@ Repository:
-Create the new extension in the repository.
-Provide a company name and a URL to the company website. This setting should be ignored
- when generating the udpate feed. Instead the publisher name from the extension is used.
+ when generating the update feed. Instead the publisher name from the extension is used.
Enter "Publisher Title" : some arbitrary company name
"Publisher URL": any arbitrary URL but not:
http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US.html
@@ -147,7 +147,7 @@ Test
Repository:
-Create the new extension in the repository.
--Provide a company name and a URL to the company website. They should then be in the udpate
+-Provide a company name and a URL to the company website. They should then be in the update
feed.
-Create a new release for the extension. Upload the version 2.0 (update/pub10.oxt).
@@ -190,7 +190,7 @@ Test
Repository:
-Create the new extension in the repository.
--Provide a company name and a URL to the company website. They should then be in the udpate
+-Provide a company name and a URL to the company website. They should then be in the update
feed.
-Create a new release for the extension. Upload the version 2.0 (update/pub11.oxt).
diff --git a/desktop/test/deployment/update/readme.txt b/desktop/test/deployment/update/readme.txt
index efcba32..1ddcdc8 100644
--- a/desktop/test/deployment/update/readme.txt
+++ b/desktop/test/deployment/update/readme.txt
@@ -41,13 +41,13 @@ For example
.../update/simple/update
.../update/license/update
-.../update/updatefeed/udpate
+.../update/updatefeed/update
The different test folders for the update are also committed in project extensions/www
so that the files can be obtain via an URL. The structure and the contents is about the
same as the content
-of desktop/test/deployment/udpate
+of desktop/test/deployment/update
For example in
extensions/www/testarea/desktop
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index 3ecc266f..f930660 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -379,7 +379,7 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo)
/**
* @descr: Whether there are other fribs following current frib.
-* @return: Ture if having following fribs, or false.
+* @return: True if having following fribs, or false.
*/
bool LwpFrib::HasNextFrib()
{
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 1a3967c..d5b22e5 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -683,7 +683,7 @@ double LwpPageLayout::GetHeight()
return fHeight;
}
/**
-* @descr: Compare the position of layout. If the poistion of this layout is earlier than other layout,return ture, or return false
+* @descr: Compare the position of layout. If the position of this layout is earlier than other layout,return true, or return false
*
*/
bool LwpPageLayout::operator<(LwpPageLayout& Other)
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index f4b8eff..465438b 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -318,7 +318,7 @@ bool LwpStory::IsNeedSection()
}
}
- //if bColumns is ture, the page layout doesn't need columns, set the xfcolumns to NULL in page master
+ //if bColumns is true, the page layout doesn't need columns, set the xfcolumns to NULL in page master
if(!bColumns)
{
m_pCurrentLayout->ResetXFColumns();
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 10241a3..8a25ab2 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -210,7 +210,7 @@ public class ProcessHandler
* log stream where debug info and output of external command is printed.
* If log stream is null, logging is printed to stdout.
* From the <CODE>TestParameters</CODE> the <CODE>OfficeWachter</CODE> get a ping.
- * @param shortWait If this parameter is ture the <CODE>mTimeOut</CODE> is set to 5000 ms, else it is set to
+ * @param shortWait If this parameter is true the <CODE>mTimeOut</CODE> is set to 5000 ms, else it is set to
* half of time out from parameter timeout.
* @param param the TestParameters
* @see lib.TestParameters
diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx
index f5fba10..0109972 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -238,7 +238,7 @@ private:
bool mbSmartFlags; /// true = omit flags on empty string; false = always write flags.
bool mbSkipFormats; /// true = skip formats on export; false = write complete formatted string.
bool mbWrapped; /// true = text contains several paragraphs.
- bool mbSkipHeader; /// ture = skip length and flags when writing string bytes.
+ bool mbSkipHeader; /// true = skip length and flags when writing string bytes.
};
inline bool operator==( const XclExpString& rLeft, const XclExpString& rRight )
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index 7214e90..caed95e 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -132,7 +132,7 @@ sub create_media_table
my $counter = 0;
# Sorting of files collector files required !
- # Attention: The order in the cab file is not guaranteed (especially in udpate process)
+ # Attention: The order in the cab file is not guaranteed (especially in update process)
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 107311d..bf057cc 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -500,7 +500,7 @@ private:
*/
SAL_DLLPRIVATE void impl_defaultCurrentForm_nothrow();
- /** sets m_xCurrentForm to the provided form, and udpates everything which
+ /** sets m_xCurrentForm to the provided form, and updates everything which
depends on the current form
*/
SAL_DLLPRIVATE void impl_updateCurrentForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxNewCurForm );
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index 18f0ff89..362003c 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -113,7 +113,7 @@ class SwMasterUsrPref : public SwViewOption
friend class SwCursorConfig;
friend class SwWebColorConfig;
- SwFldUpdateFlags eFldUpdateFlags; //udpate of fields and charts
+ SwFldUpdateFlags eFldUpdateFlags; //update of fields and charts
sal_Int32 nLinkUpdateMode;
FieldUnit eUserMetric;
FieldUnit eHScrollMetric;
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index fe294cb..b70f436 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -433,7 +433,7 @@ void CTLayout::drawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef ctline, cons
for(; iter != m_vRunData.end(); ++iter)
{
CTRunRef run = iter->m_pRun;
- /* if we do not have Ajusted Poistions for a run, just use CoreText to draw it */
+ /* if we do not have Adjusted Positions for a run, just use CoreText to draw it */
if(iter->m_pAdjPositions)
{
CTFontRef runFont = iter->m_pFont;
commit aec4088cd3bc01daaa324051abbe961d212c9c3b
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Feb 24 23:33:22 2015 +0100
Typo: increse->increase
Change-Id: I4942a9ef4d3805865896c83cd9efa66437857ba1
diff --git a/cli_ure/readme.txt b/cli_ure/readme.txt
index 1f4d848..20d8d0a 100644
--- a/cli_ure/readme.txt
+++ b/cli_ure/readme.txt
@@ -80,7 +80,7 @@ assembly in the GAC then leave it at that.
The values have to be adjusted as follows:
-XYZ_NEW_VERSION : increse the value of the version
+XYZ_NEW_VERSION : increase the value of the version
GAC. "XYZ_" would be "CLI_URETYPES", "CLI_URE", etc.
XYZ_OLD_VERSION : must be changes so that the right version part is one less than
XYZ_NEW_VERSION. For example
More information about the Libreoffice-commits
mailing list