[Libreoffice-commits] .: 2 commits - framework/inc framework/source offapi/com sc/source sd/source sfx2/source sw/source vbahelper/source
Korrawit Pruegsanusak
korrawit at kemper.freedesktop.org
Sun Nov 27 19:33:35 PST 2011
framework/inc/helper/fixeddocumentproperties.hxx | 8 ++++----
framework/source/inc/loadenv/loadenv.hxx | 2 +-
framework/source/jobs/jobdispatch.cxx | 12 ++++++------
framework/source/jobs/shelljob.cxx | 10 +++++-----
offapi/com/sun/star/drawing/framework/XConfiguration.idl | 2 +-
sc/source/ui/Accessibility/AccessibleFilterMenu.cxx | 2 +-
sd/source/ui/inc/TemplateScanner.hxx | 2 +-
sfx2/source/control/dispatch.cxx | 2 +-
sw/source/core/view/viewpg.cxx | 4 ++--
sw/source/core/view/vprint.cxx | 2 +-
sw/source/ui/inc/labimg.hxx | 2 +-
sw/source/ui/inc/navicont.hxx | 2 +-
sw/source/ui/wrtsh/navmgr.cxx | 2 +-
vbahelper/source/vbahelper/vbahelper.cxx | 2 +-
14 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit ab5b77536b6814b5eb66bc862bfd0610f4f3b56c
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date: Mon Nov 28 10:30:25 2011 +0700
s/weather/whether/ where appropriate
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 0408fb7..59bad3c 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -658,7 +658,7 @@ class LoadEnv : private ThreadHelpBase
//_______________________________________
- /** @short checks weather a frame is already used for another load request or not.
+ /** @short checks whether a frame is already used for another load request or not.
@descr Such frames cant be used for our "recycle feature"!
diff --git a/offapi/com/sun/star/drawing/framework/XConfiguration.idl b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
index ad6bf6a..2b7bdb1 100644
--- a/offapi/com/sun/star/drawing/framework/XConfiguration.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
@@ -84,7 +84,7 @@ published interface XConfiguration
[in] string sTargetURLPrefix,
[in] AnchorBindingMode eSearchMode);
- /** <p>Returns weather the specified resource is part of the
+ /** <p>Returns whether the specified resource is part of the
configuration.</p>
This is independent of whether the resource does really exist and is
active, i.e. has a visible representation in the GUI.
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index b1d34bb..369bfab 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -325,7 +325,7 @@ Rectangle ScAccessibleFilterMenu::GetBoundingBox() const
void ScAccessibleFilterMenu::appendMenuItem(const OUString& rName, bool bEnabled, size_t nMenuPos)
{
- // Check weather this menu item is a sub menu or a regular menu item.
+ // Check whether this menu item is a sub menu or a regular menu item.
ScMenuFloatingWindow* pSubMenu = mpWindow->getSubMenuWindow(nMenuPos);
Reference<XAccessible> xAccessible;
if (pSubMenu)
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index f44c042..a746df7 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -190,7 +190,7 @@ private:
*/
std::vector<TemplateDir*> maFolderList;
- /** Weather the template entries have to be sorted.
+ /** Whether the template entries have to be sorted.
*/
bool mbEntrySortingEnabled;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 7e925ab..44d0a51 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1554,7 +1554,7 @@ void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bo
if ( bReadOnlyShell && !( nPos & SFX_VISIBILITY_READONLYDOC ) )
continue;
- // check weather toolbar needs activation of a special feature
+ // check whether toolbar needs activation of a special feature
sal_uInt32 nFeature = pIFace->GetObjectBarFeature(nNo);
if ( nFeature && !pShell->HasUIFeature( nFeature ) )
continue;
diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx
index c0b9c40..8d49bdc 100644
--- a/sw/source/ui/wrtsh/navmgr.cxx
+++ b/sw/source/ui/wrtsh/navmgr.cxx
@@ -180,7 +180,7 @@ bool SwNavigationMgr::addEntry(const SwPosition& rPos) {
bool bForwardWasEnabled = forwardEnabled();
bool bRet = false; // return value of the function.
- // Indicates weather the index should be decremented before jumping back or not
+ // Indicates whether the index should be decremented before jumping back or not
#if SMART
/* If any forward history exists, twist the tail of the list from the current position to the end */
if (bForwardWasEnabled) {
commit c0a9d3d3f91e7a5e7fd420b4bce9955de48187a8
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date: Mon Nov 28 10:21:57 2011 +0700
typos fixing
diff --git a/framework/inc/helper/fixeddocumentproperties.hxx b/framework/inc/helper/fixeddocumentproperties.hxx
index d701323..1e99305 100644
--- a/framework/inc/helper/fixeddocumentproperties.hxx
+++ b/framework/inc/helper/fixeddocumentproperties.hxx
@@ -17,15 +17,15 @@ struct FixedDocumentProperties
sal_Bool m_bAutoloadEnabled ; /// Automatic reload enabled/disabled ?
sal_Int32 m_nAutoloadSecs ; /// Time cycle for automatic reload
::rtl::OUString m_sAutoloadURL ; /// URL for automatic reload
- ::rtl::OUString m_sBlindCopiesTo ; /// Adress for BCC
- ::rtl::OUString m_sCopiesTo ; /// Adress CC
+ ::rtl::OUString m_sBlindCopiesTo ; /// Address for BCC
+ ::rtl::OUString m_sCopiesTo ; /// Address CC
com::sun::star::util::DateTime m_aCreationDate ; /// Time and date of document creation
::rtl::OUString m_sDefaultTarget ; /// Name of default target
::rtl::OUString m_sDescription ; /// Short description and comments
sal_Int16 m_nEditingCycles ; /// Document number
sal_Int32 m_nEditingDuration ; /// Duration since last edit
com::sun::star::uno::Sequence< sal_Int8 > m_seqExtraData ; /// Buffer of bytes for some extra data
- ::rtl::OUString m_sInReplyTo ; /// Adress for reply to ...
+ ::rtl::OUString m_sInReplyTo ; /// Address for reply to ...
sal_Bool m_bIsEncrypted ; /// Document is en/decrypted
::rtl::OUString m_sKeywords ; /// Some keywords
::rtl::OUString m_sMIMEType ; /// MIME-type of document
@@ -40,7 +40,7 @@ struct FixedDocumentProperties
sal_Bool m_bQueryTemplate ; /// Search for template ?
::rtl::OUString m_sRecipient ; /// Name of recipient
::rtl::OUString m_sReferences ; /// Some references to other things
- ::rtl::OUString m_sReplyTo ; /// Adress to reply
+ ::rtl::OUString m_sReplyTo ; /// Address to reply
sal_Bool m_bSaveGraphicsCompressed ; /// Compressed/non compressed graphics
sal_Bool m_bSaveOriginalGraphics ; /// Include graphics
sal_Bool m_bSaveVersionOnClose ; /// Save version on close of document ?
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 5c22ad9..1ce9741 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -332,8 +332,8 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString&
// Special mode for listener.
// We dont notify it directly here. We delegate that
// to the job implementation. But we must set ourself there too.
- // Because this job must fake the source adress of the event.
- // Otherwhise the listener may will ignore it.
+ // Because this job must fake the source address of the event.
+ // Otherwise the listener may ignore it.
if (xListener.is())
pJob->setDispatchResultFake(xListener, xThis);
pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs));
@@ -394,8 +394,8 @@ void JobDispatch::impl_dispatchService( /*IN*/ const ::rtl::OUString&
// Special mode for listener.
// We dont notify it directly here. We delegate that
// to the job implementation. But we must set ourself there too.
- // Because this job must fake the source adress of the event.
- // Otherwhise the listener may will ignore it.
+ // Because this job must fake the source address of the event.
+ // Otherwise the listener may ignore it.
if (xListener.is())
pJob->setDispatchResultFake(xListener, xThis);
pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs));
@@ -445,8 +445,8 @@ void JobDispatch::impl_dispatchAlias( /*IN*/ const ::rtl::OUString&
// Special mode for listener.
// We dont notify it directly here. We delegate that
// to the job implementation. But we must set ourself there too.
- // Because this job must fake the source adress of the event.
- // Otherwhise the listener may will ignore it.
+ // Because this job must fake the source address of the event.
+ // Otherwise the listener may ignore it.
if (xListener.is())
pJob->setDispatchResultFake(xListener, xThis);
pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs));
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 8dfad83..1ce3266 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -59,19 +59,19 @@ namespace framework{
//_______________________________________________
// definitions
-/** adress job configuration inside argument set provided on method execute(). */
+/** address job configuration inside argument set provided on method execute(). */
static const ::rtl::OUString PROP_JOBCONFIG(RTL_CONSTASCII_USTRINGPARAM("JobConfig"));
-/** adress job configuration property "Command". */
+/** address job configuration property "Command". */
static const ::rtl::OUString PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command"));
-/** adress job configuration property "Arguments". */
+/** address job configuration property "Arguments". */
static const ::rtl::OUString PROP_ARGUMENTS(RTL_CONSTASCII_USTRINGPARAM("Arguments"));
-/** adress job configuration property "DeactivateJobIfDone". */
+/** address job configuration property "DeactivateJobIfDone". */
static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE(RTL_CONSTASCII_USTRINGPARAM("DeactivateJobIfDone"));
-/** adress job configuration property "CheckExitCode". */
+/** address job configuration property "CheckExitCode". */
static const ::rtl::OUString PROP_CHECKEXITCODE(RTL_CONSTASCII_USTRINGPARAM("CheckExitCode"));
//-----------------------------------------------
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 968f644..f7969d1 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -113,7 +113,7 @@ void ViewShell::PrintProspect(
aShell.PrepareForPrint( rPrintData );
- //!! applying view options and formatting the dcoument should now only be done in getRendererCount!
+ //!! applying view options and formatting the document should now only be done in getRendererCount!
MapMode aMapMode( MAP_TWIP );
Size aPrtSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), aMapMode ) );
@@ -226,7 +226,7 @@ void ViewShell::PrintProspect(
SwPaintQueue::Repaint();
- //!! applying/modifying view options and formatting the dcoument should now only be done in getRendererCount!
+ //!! applying/modifying view options and formatting the document should now only be done in getRendererCount!
pFntCache->Flush();
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 69c1b71..edf1374 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -512,7 +512,7 @@ sal_Bool ViewShell::PrintOrPDFExport(
return sal_False;
}
- //!! applying view options and formatting the dcoument should now only be done in getRendererCount!
+ //!! applying view options and formatting the document should now only be done in getRendererCount!
::SetSwVisArea( pViewSh2, pStPage->Frm() );
diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx
index 6733e40..45da9ad 100644
--- a/sw/source/ui/inc/labimg.hxx
+++ b/sw/source/ui/inc/labimg.hxx
@@ -68,7 +68,7 @@ public:
sal_Int32 nRows; // number of rows (user)
sal_Int32 nCol; // column for single print
sal_Int32 nRow; // row for single print
- sal_Bool bAddr;// adress as label?
+ sal_Bool bAddr;// address as label?
sal_Bool bCont;// continuous paper?
sal_Bool bPage;// whole page or single labels?
sal_Bool bSynchron;// synchronise all labels
diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx
index ba7d500..f58f92b 100644
--- a/sw/source/ui/inc/navicont.hxx
+++ b/sw/source/ui/inc/navicont.hxx
@@ -43,7 +43,7 @@ class NaviContentBookmark
{
String aUrl; // URL including jump mark
String aDescr; // description
- long nDocSh; // adress of DocShell
+ long nDocSh; // address of DocShell
sal_uInt16 nDefDrag; // description contains defaultDragType
public:
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index ebce6ff..adc1d63 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -267,7 +267,7 @@ getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException)
!xModel.is() )
{
throw uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the current documet context") ), uno::Reference< uno::XInterface >() );
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( it's obviously not set yet ) therefore don't know the current document context") ), uno::Reference< uno::XInterface >() );
}
else
{
More information about the Libreoffice-commits
mailing list