[Libreoffice-commits] core.git: sdext/source sd/source sfx2/source solenv/bin stoc/test svl/source
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Oct 1 19:13:33 UTC 2016
sd/source/filter/ppt/pptinanimations.cxx | 4 ++--
sd/source/ui/docshell/docshel4.cxx | 4 ++--
sdext/source/presenter/PresenterSlideSorter.cxx | 2 +-
sfx2/source/dialog/dockwin.cxx | 2 +-
sfx2/source/doc/objcont.cxx | 2 +-
sfx2/source/doc/printhelper.cxx | 2 +-
sfx2/source/sidebar/SidebarController.cxx | 2 +-
solenv/bin/bin_library_info.sh | 4 ++--
stoc/test/testregistry.cxx | 2 +-
svl/source/items/poolio.cxx | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 441fa1c03664081d76bf6007c4ac0aee32f56342
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sat Oct 1 14:12:30 2016 +0200
Fix typos
Change-Id: I1e0e6f1b99090f26a6cd657ee9019bf2fa906dd9
Reviewed-on: https://gerrit.libreoffice.org/29436
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index a280ca5..bbcc709 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -319,7 +319,7 @@ int AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refere
xNode = mxRootNode;
}
- // import if we have a node and its not random
+ // import if we have a node and it's not random
if( xNode.is() )
{
fillNode( xNode, aNode, aSet );
@@ -622,7 +622,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >&
xNode->setUserData( aUserData );
}
- // if its an after effect node, add it to the list for
+ // if it's an after effect node, add it to the list for
// later processing
// after effect nodes are not inserted at their import
// position, so return false in this case
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 3668a95..63696aa 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -175,14 +175,14 @@ Printer* DrawDocShell::GetDocumentPrinter()
void DrawDocShell::OnDocumentPrinterChanged(Printer* pNewPrinter)
{
- // if we already have a printer, see if its the same
+ // if we already have a printer, see if it's the same
if( mpPrinter )
{
// easy case
if( mpPrinter == pNewPrinter )
return;
- // compare if its the same printer with the same job setup
+ // compare if it's the same printer with the same job setup
if( (mpPrinter->GetName() == pNewPrinter->GetName()) &&
(mpPrinter->GetJobSetup() == pNewPrinter->GetJobSetup()))
return;
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 8f03f61..6d58ac6 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -771,7 +771,7 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
}
else
{
- // if its not RTL place vertical scroll bar at right border.
+ // if it's not RTL place vertical scroll bar at right border.
mpVerticalScrollBar->SetPosSize(geometry::RealRectangle2D(
rUpperBox.X2 - mpVerticalScrollBar->GetSize(),
rUpperBox.Y1,
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 66ec34b..9fe7b04 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -759,7 +759,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
{
// If the alignment changes and the window is in a docked state in a
// SplitWindow, then it must be re-registered. If it is docked again,
- // PrepareToggleFloatingMode() and ToggleFloatingMode() preform the
+ // PrepareToggleFloatingMode() and ToggleFloatingMode() perform the
// re-registered
if ( !bFloatMode )
bReArrange = true;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 03aaa3a..fc25b5f 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -237,7 +237,7 @@ void SfxObjectShell::UpdateTime_Impl(
tools::Time nAddTime (0) ; // Value to add on aOldTime
// Safe impossible cases!
- // User has changed time to the past between last editing and now ... its not possible!!!
+ // User has changed time to the past between last editing and now ... it's not possible!!!
DBG_ASSERT( !(aNow.GetDate()<pImpl->nTime.GetDate()), "Timestamp of last change is in the past ?!..." );
// Do the follow only, if user has NOT changed time to the past.
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 5c3b4b8..a54bc2d 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -644,7 +644,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
// We try to convert it to a file URL. If its possible
// we put the system path to the item set and let vcl work with it.
// No ucb or thread will be necessary then. In case it couldnt be
- // converted its not an URL nor a system path. Then we can't accept
+ // converted it's not an URL nor a system path. Then we can't accept
// this parameter and have to throw an exception.
const OUString& sSystemPath(sTemp);
OUString sFileURL;
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 686707a..efb0911 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -414,7 +414,7 @@ void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth)
else
{
// Deck became too small. Close it completely.
- // If window is wider than the tab bar then mark the deck as being visible, even when it its not.
+ // If window is wider than the tab bar then mark the deck as being visible, even when it is not.
// This is to trigger an adjustment of the width to the width of the tab bar.
mbIsDeckOpen = true;
RequestCloseDeck();
diff --git a/solenv/bin/bin_library_info.sh b/solenv/bin/bin_library_info.sh
index bb93773..88925bf 100755
--- a/solenv/bin/bin_library_info.sh
+++ b/solenv/bin/bin_library_info.sh
@@ -14,8 +14,8 @@ in git.
syntax: bin_library_info.sh -m|--module <top_level_module> -l|--location <TARFILE_LOCATION> -s|--srcdir <SRCDIR> -b <BUILDDIR> -r|--tarfile <LIBRARY_TARFILE> [ -m|--mode verify|name ]
-the default mode is 'name' which just print the assocaited binary tarfile name.
-in 'verify' mode the programe print the name if the assocaited binary tarfile exist
+the default mode is 'name' which just print the associated binary tarfile name.
+in 'verify' mode the programe print the name if the associated binary tarfile exist
and print nothing and return an error code if the file does not exist
Note: --location --builddir and --srcdir are optional if they are already in the env in the form of TARFILE_LOCATION and BUILDDIR SRCDIR respectively
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index 07e5d09..b2dd4dd 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -455,7 +455,7 @@ void test_DefaultRegistry(
OSL_ENSURE( xServInfo.is(), "test_DefaultRegistry error2");
- OSL_ENSURE( xServInfo->getImplementationName() == "com.sun.star.comp.stoc.NestedRegistry", "test_DefualtRegistry error3");
+ OSL_ENSURE( xServInfo->getImplementationName() == "com.sun.star.comp.stoc.NestedRegistry", "test_DefaultRegistry error3");
OSL_ENSURE( xServInfo->supportsService("com.sun.star.registry.NestedRegistry"), "test_DefaultRegistry error4");
OSL_ENSURE( xServInfo->getSupportedServiceNames().getLength() == 1, "test_DefaultRegistry error5");
xServInfo.clear();
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 42a6876..b69ddab 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -985,7 +985,7 @@ void SfxItemPool::SetStoringRange( sal_uInt16 nFrom, sal_uInt16 nTo )
* WhichIds. Moving WhichIds is not permitted.
* This method should only be called in or right after the ctor.
*
- * The array must be static, because its not copied and reused in the
+ * The array must be static, because it's not copied and reused in the
* copy-ctor of the SfxItemPool
*
* Example usage:
More information about the Libreoffice-commits
mailing list