[Libreoffice-commits] core.git: chart2/source dbaccess/source sc/inc sc/source vcl/opengl

Jan Holesovsky kendy at collabora.com
Mon Jun 8 01:30:24 PDT 2015


 chart2/source/view/charttypes/PieChart.cxx           |    4 ++--
 dbaccess/source/core/dataaccess/databasecontext.cxx  |    2 +-
 dbaccess/source/core/dataaccess/databasedocument.cxx |    2 +-
 dbaccess/source/filter/xml/xmlfilter.cxx             |    2 +-
 sc/inc/column.hxx                                    |    2 +-
 sc/source/ui/view/gridwin3.cxx                       |    2 +-
 vcl/opengl/blendedTextureFragmentShader.glsl         |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 9535d5d1fdbd1a529e4d7a6b5e3df6c551465364
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Jun 8 10:29:27 2015 +0200

    \<the the\> -> the
    
    Change-Id: I9d820446411eb7dfca37bb3baf5e994f4ba6f421

diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 4ba5ce7..dca4f20 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -124,7 +124,7 @@ PiePositionHelper::~PiePositionHelper()
  *      inner_radius = (ring_index + 1) - 0.5 + max_offset,
  *      outer_radius = (ring_index + 1) + 0.5 + max_offset.
  *  When orientation for the radius axis is reversed these values are swapped.
- *  (Indeed the the orientation for the radius axis is always reversed!
+ *  (Indeed the orientation for the radius axis is always reversed!
  *  See `PieChartTypeTemplate::adaptScales`.)
  *  The maximum relative offset (see notes for P`ieChart::getMaxOffset`) is
  *  added to both the inner and the outer radius.
@@ -556,7 +556,7 @@ void PieChart::createShapes()
 
         bool bHasFillColorMapping = pSeries->hasPropertyMapping("FillColor");
 
-        /// The angle degree offset is set by the the same property of the
+        /// The angle degree offset is set by the same property of the
         /// data series.
         /// Counter-clockwise offset from the 3 o'clock position.
         m_pPosHelper->m_fAngleDegreeOffset = pSeries->getStartingAngle();
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 32c63a1..7523f29 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -368,7 +368,7 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const OUString& _rNa
         aArgs.put( "InteractionHandler", task::InteractionHandler::createWithParent(m_aContext, 0) );
         if (bEmbeddedDataSource)
         {
-            // In this case the host contains the real path, and the the path is the embedded stream name.
+            // In this case the host contains the real path, and the path is the embedded stream name.
             OUString sBaseURI = aURL.GetHost(INetURLObject::DECODE_WITH_CHARSET) + aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET);
             aArgs.put("BaseURI", sBaseURI);
         }
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 8c82907..9cd4a9f 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1676,7 +1676,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
     OUString sURL = _rMediaDescriptor.getOrDefault("URL", OUString());
     if (sURL.startsWithIgnoreAsciiCase("vnd.sun.star.pkg:"))
     {
-        // In this case the host contains the real path, and the the path is the embedded stream name.
+        // In this case the host contains the real path, and the path is the embedded stream name.
         INetURLObject aURL(sURL);
         sStreamRelPath = aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET);
         if (sStreamRelPath.startsWith("/"))
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 6b1e16b..0d0ee5a 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -456,7 +456,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
             OUString sStreamRelPath;
             if (sFileName.startsWithIgnoreAsciiCase("vnd.sun.star.pkg:"))
             {
-                // In this case the host contains the real path, and the the path is the embedded stream name.
+                // In this case the host contains the real path, and the path is the embedded stream name.
                 INetURLObject aURL(sFileName);
                 sFileName = aURL.GetHost(INetURLObject::DECODE_WITH_CHARSET);
                 sStreamRelPath = aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET);
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index d5e6625..9a1ac59 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -633,7 +633,7 @@ public:
      * Reset column position of formula cells within specified row range.
      * If bUpdateRefs==true then reference positions are also adjusted to
      * reflect the new position so that the formula cells still reference the
-     * same cells or ranges after the the position change.
+     * same cells or ranges after the position change.
      * The position of a formula cell before the call is interpreted as the old
      * position of that cell.
      *
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index b1e7b6f..9b34921 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -289,7 +289,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce )
 
 void ScGridWindow::DrawAfterScroll()
 {
-    Update(); // always, so the the behaviour with and without DrawingLayer is the same
+    Update(); // always, so the behaviour with and without DrawingLayer is the same
 
     ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
     if (pDrView)
diff --git a/vcl/opengl/blendedTextureFragmentShader.glsl b/vcl/opengl/blendedTextureFragmentShader.glsl
index b46f6ce..318023c 100644
--- a/vcl/opengl/blendedTextureFragmentShader.glsl
+++ b/vcl/opengl/blendedTextureFragmentShader.glsl
@@ -20,7 +20,7 @@ void main() {
     texel2 = texture2D(alpha, alpha_coord);
     gl_FragColor = texel0;
 
-    /* Only blend if the the alpha texture wasn't fully transparent */
+    /* Only blend if the alpha texture wasn't fully transparent */
     gl_FragColor.a = 1.0 - (1.0 - floor(texel2.r)) * texel1.r;
 }
 


More information about the Libreoffice-commits mailing list