[Libreoffice-commits] core.git: scripting/source

[Andrea Gelmini]

 scripting/source/pyprov/pythonscript.py |  143 
 1 file changed, 72 insertions(+), 71 deletions(-)

New commits:
commit 0e5318aa75b615b35a3d07172bdeb26eb5acfdd9
Author: Andrea Gelmini 
Date:   Tue Sep 22 11:35:52 2015 +0200

Script: better way to detect Windows

Change-Id: I0e99443f3715cde4414d14b2fa507ecab0995c6d
Reviewed-on: https://gerrit.libreoffice.org/18937
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 03f0cde..c62c228 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -23,6 +23,7 @@ import os
 import imp
 import time
 import ast
+import platform
 
 try:
 unicode
@@ -82,18 +83,18 @@ def getLogTarget():
 except:
 print("Exception during creation of pythonscript logfile: "+ 
lastException2String() + "\n, delagating log to stdout\n")
 return ret
-  
+
 class Logger(LogLevel):
 def __init__(self , target ):
 self.target = target
 
 def isDebugLevel( self ):
 return self.use >= self.DEBUG
-
+
 def debug( self, msg ):
 if self.isDebugLevel():
 self.log( self.DEBUG, msg )
-
+
 def isErrorLevel( self ):
 return self.use >= self.ERROR
 
@@ -159,12 +160,12 @@ def readTextFromStream( inputStream ):
 if read < BLOCK_SIZE:
break
 return code.value
-
+
 def toIniName( str ):
-# TODO: what is the official way to get to know whether i am on the 
windows platform ?
-if( hasattr(sys , "dllhandle") ):
+if platform.system() == "Windows":
 return str + ".ini"
-return str + "rc"
+else:
+return str + "rc"
 
 
 """ definition: storageURI is the system dependent, absolute file url, where 
the script is stored on disk
@@ -177,7 +178,7 @@ class MyUriHelper:
 { "share" : 
"vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python" , \
   "share:uno_packages" : 
"vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages", \
   "user" : "vnd.sun.star.expand:${$BRAND_INI_DIR/" + toIniName( 
"bootstrap") + "::UserInstallation}/user/Scripts/python" , \
-  "user:uno_packages" : 
"vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" } 
+  "user:uno_packages" : 
"vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" }
 self.m_uriRefFac = 
ctx.ServiceManager.createInstanceWithContext("com.sun.star.uri.UriReferenceFactory",ctx)
 if location.startswith( "vnd.sun.star.tdoc" ):
 self.m_baseUri = location + "/Scripts/python"
@@ -186,10 +187,10 @@ class MyUriHelper:
 self.m_baseUri = expandUri( self.s_UriMap[location] )
 self.m_scriptUriLocation = location
 log.debug( "initialized urihelper with baseUri="+self.m_baseUri + 
",m_scriptUriLocation="+self.m_scriptUriLocation )
-
+
 def getRootStorageURI( self ):
 return self.m_baseUri
-
+
 def getStorageURI( self, scriptURI ):
 return self.scriptURI2StorageUri(scriptURI)
 
@@ -207,7 +208,7 @@ class MyUriHelper:
   "?language=" + LANGUAGENAME + "&location=" + 
self.m_scriptUriLocation
 log.debug( "converting storageURI="+storageURI + " to scriptURI=" + 
ret )
 return ret
-
+
 def scriptURI2StorageUri( self, scriptURI ):
 try:
 myUri = self.m_uriRefFac.parse(scriptURI)
@@ -220,7 +221,7 @@ class MyUriHelper:
 except Exception as e:
 log.error( "error during converting scriptURI="+scriptURI + ": " + 
str(e))
 raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + 
str(e), None )
-
+
 
 class ModuleEntry:
 def __init__( self, lastRead, module ):
@@ -256,14 +257,14 @@ def checkForPythonPathBesideScript( url ):
 if 1 == os.access( encfile(path), os.F_OK) and not path in sys.path:
 log.log( LogLevel.DEBUG, "adding " + path + " to sys.path" )
 sys.path.append( path )
-
-
+
+
 class ScriptContext(unohelper.Base):
 def __init__( self, ctx, doc, inv ):
 self.ctx = ctx
 self.doc = doc
 self.inv = inv
-   
+
# XScriptContext
 def getDocument(self):
 if self.doc:
@@ -296,12 +297,12 @@ class ScriptContext(unohelper.Base):
 #log.debug("file " + url + " has changed, reloading")
 #else:
 #load = False
-#
+#
 #if load:
 #log.debug( "opening >" + url + "<" )
 #
 #code = readTextFromStream( sfa.openFileRead( url ) )
-
+
 # execute the module
 #entry = ModuleEntry( lastRead, imp.new_module("ooo_script_framework") 
)
 #entry.module.__dict__[GLOBAL_SCRIPTCONTEXT_NAME] = g_scriptContext
@@ -324,13 +325,13 @@ class ProviderContext:
 def getTransientPartFromUrl( self, url ):
 rest = url.r

[Libreoffice-commits] core.git: sw/source

[Andrea Gelmini]

 sw/source/core/edit/editsh.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit b78a2bc3d427e083fe309d0d8ee5e9e74f7f5119
Author: Andrea Gelmini 
Date:   Tue Sep 22 19:57:42 2015 +0200

Remove no-more-existent file reference

Change-Id: I913a59612ab1eb31cc15718bebc3623eecad4383
Reviewed-on: https://gerrit.libreoffice.org/18929
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 7e26933..02eb42d 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -423,8 +423,6 @@ const SwDocStat& SwEditShell::GetUpdatedDocStat()
 return rRet;
 }
 
-// OPT: eddocinl.cxx
-
 /// get the reference of a given name in the Doc
 const SwFormatRefMark* SwEditShell::GetRefMark( const OUString& rName ) const
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source

[Laurent Balland-Poirier]

 chart2/source/inc/RegressionCalculationHelper.hxx|3 ---
 chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx |8 +++-
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 7704f811212cda3f4842cc095ad6cf4fd2c98d27
Author: Laurent Balland-Poirier 
Date:   Tue Sep 29 22:30:42 2015 +0200

Trend line equation: remove useless defines

Change-Id: I9a2089f1f7e3b0e881d4136293d557efb3c1ef1c
Reviewed-on: https://gerrit.libreoffice.org/19001
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx 
b/chart2/source/inc/RegressionCalculationHelper.hxx
index bd03e1c..8c88687 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -26,9 +26,6 @@
 #include 
 #include 
 
-#define UC_SPACE (sal_Unicode(' '))
-#define UC_MINUS_SIGN (sal_Unicode('-'))
-
 namespace chart
 {
 namespace RegressionCalculationHelper
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx 
b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index 1d5251c..d43d437 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -141,12 +141,12 @@ OUString 
LogarithmicRegressionCurveCalculator::ImplGetRepresentation(
 if( ::rtl::math::approxEqual( fabs( m_fSlope ), 1.0 ))
 {
 if( m_fSlope < 0 )
-aBuf.append( UC_MINUS_SIGN );
+aBuf.append( "-" );
 }
 else
 {
 aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, 
m_fSlope ));
-aBuf.append( UC_SPACE );
+aBuf.append( " " );
 }
 aBuf.append( "ln(x)" );
 bHaveSlope = true;
@@ -156,9 +156,7 @@ OUString 
LogarithmicRegressionCurveCalculator::ImplGetRepresentation(
 {
 if( m_fIntercept < 0.0 )
 {
-aBuf.append( UC_SPACE );
-aBuf.append( UC_MINUS_SIGN );
-aBuf.append( UC_SPACE );
+aBuf.append( " - " );
 aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, 
fabs( m_fIntercept )));
 }
 else if( m_fIntercept > 0.0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java reportdesign/source rsc/inc rsc/source

[Andrea Gelmini]

 
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 
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 
Tested-by: Samuel Mehrbrodt 

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)

[Libreoffice-commits] core.git: vcl/source

[Andrea Gelmini]

 vcl/source/filter/sgvtext.cxx   |6 +++---
 vcl/source/filter/wmf/winwmf.cxx|4 ++--
 vcl/source/filter/wmf/wmfwr.hxx |2 +-
 vcl/source/gdi/bitmap.cxx   |2 +-
 vcl/source/gdi/bitmap3.cxx  |2 +-
 vcl/source/gdi/gdimetafiletools.cxx |2 +-
 vcl/source/gdi/pdfwriter_impl.cxx   |6 +++---
 vcl/source/gdi/print3.cxx   |2 +-
 vcl/source/gdi/regband.cxx  |2 +-
 vcl/source/gdi/region.cxx   |2 +-
 vcl/source/gdi/regionband.cxx   |2 +-
 vcl/source/outdev/bitmap.cxx|2 +-
 vcl/source/outdev/font.cxx  |2 +-
 vcl/source/outdev/gradient.cxx  |2 +-
 vcl/source/outdev/transparent.cxx   |2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 4314fb6418299f28139132d1044f890712c57e8f
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:13:11 2015 +0200

Fix typos

Change-Id: I33385f1395f428c14bf86eff9891b288ddc590de
Reviewed-on: https://gerrit.libreoffice.org/18993
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 62e877b..e05ffb3 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -63,7 +63,7 @@ extern SgfFontLst* pSgfFonts;
 #define  EscLFeed  'L' /* character spacing 1..32767% of max. text angle of 
the line*/
 // or 1..32767 for 1..16383SeekRel( 4 ); // Size (of file in words)
 pWMF->SeekRel( 2 ); // NoObjects (maximum number of simultaneous objects)
-pWMF->SeekRel( 4 ); // MaxRecord (size of largets record in words)
+pWMF->SeekRel( 4 ); // MaxRecord (size of largest record in words)
 pWMF->SeekRel( 2 ); // NoParameters (Unused
 
 return pWMF->good();
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index d26cac0..dd84240 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -107,7 +107,7 @@ private:
 sal_uLong nWrittenBitmaps;  // number of bitmaps written
 sal_uLong nActBitmapPercent; // percentage of next bitmap written.
 
-bool bEmbedEMF; // optionally embedd EMF data into WMF
+bool bEmbedEMF; // optionally embed EMF data into WMF
 
 void MayCallback();
 // this function calculates percentage using the above 5 parameters
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 23b752b..e8bf0dd 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1478,7 +1478,7 @@ bool Bitmap::Replace( const Bitmap& rMask, const Color& 
rReplaceColor )
 
 for( sal_uInt16 i = 0UL; i < nMaxColors; i++ )
 {
-// Hurray, we do have an unsused entry
+// Hurray, we do have an unused entry
 if( !pFlags[ i ] )
 {
 pAcc->SetPaletteColor( (sal_uInt16) i, 
rReplaceColor );
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 9afad3f..e0da9aa 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -1566,7 +1566,7 @@ namespace
 
 // #i121233# Added BmpScaleFlag::Lanczos, BmpScaleFlag::BiCubic, 
BmpScaleFlag::BiLinear and
 // BmpScaleFlag::Box derived from the original commit from Tomas Vajngerl (see
-// bugzilla task for deitails) Thanks!
+// bugzilla task for details) Thanks!
 bool Bitmap::ImplScaleConvolution(
 const double& rScaleX,
 const double& rScaleY,
diff --git a/vcl/source/gdi/gdimetafiletools.cxx 
b/vcl/source/gdi/gdimetafiletools.cxx
index 745c9d6..b8adfdf 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -959,7 +959,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& 
rSource)
 break;
 }
 
-// need to handle gradient fills (hopefully only unroated ones)
+// need to handle gradient fills (hopefully only unrotated 
ones)
 
 case MetaActionType::GRADIENT :
 {
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index d449d1a..0911269 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -637,7 +637,7 @@ static void appendLiteralString( const sal_Char* pStr, 
sal_Int32 nLength, OStrin
  * even though they expose the content of PDF file (e.g. guessing the PDF 
content from the
  * destination name).
  *
- * Fhurter limitation: it is advisable to use standard ASCII characters for
+ * Further limitation: it is advisable to use standard ASCII characters for
  * OOo bookmarks.
 */
 static void appendDestinationName( const OUString& rString, OStringBuffer& 
rBuffer )
@@ -6119,7 +6119,7 @@ typedef struct {
 } TimeStampReq;
 
 // (Partial) ASN.1 for the time stamp response. Very complicated. Pulled
-// together from v

[Libreoffice-commits] core.git: sfx2/source

[Andrea Gelmini]

 sfx2/source/appl/appquit.cxx  |2 +-
 sfx2/source/appl/fileobj.cxx  |2 +-
 sfx2/source/appl/helpinterceptor.cxx  |2 +-
 sfx2/source/appl/shutdownicon.cxx |2 +-
 sfx2/source/bastyp/bitset.cxx |2 +-
 sfx2/source/bastyp/fltfnc.cxx |4 ++--
 sfx2/source/control/dispatch.cxx  |2 +-
 sfx2/source/control/templatelocalview.cxx |2 +-
 sfx2/source/control/thumbnailview.cxx |2 +-
 sfx2/source/control/unoctitm.cxx  |2 +-
 sfx2/source/dialog/backingcomp.cxx|2 +-
 sfx2/source/dialog/dockwin.cxx|2 +-
 sfx2/source/dialog/filtergrouping.cxx |4 ++--
 sfx2/source/dialog/splitwin.cxx   |2 +-
 sfx2/source/dialog/tplcitem.cxx   |2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit e01ef3e51e931683326aa47022a84c667036524a
Author: Andrea Gelmini 
Date:   Tue Sep 29 17:58:38 2015 +0200

Fix typos

Change-Id: Iea53373ab35bbd0189a6de1cb06ed632178a3e20
Reviewed-on: https://gerrit.libreoffice.org/18975
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 641392b..5e276c3 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -121,7 +121,7 @@ void SfxApplication::Deinitialize()
 DELETEX(SfxViewShellArr_Impl, pAppData_Impl->pViewShells);
 DELETEX(SfxObjectShellArr_Impl, pAppData_Impl->pObjShells);
 
-//TODO/CLEANTUP
+//TODO/CLEANUP
 //ReleaseArgs could be used instead!
 pAppData_Impl->pPool = NULL;
 NoChaos::ReleaseItemPool();
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index cb87302..15168bc 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -103,7 +103,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & 
rData,
 {
 Graphic aGrf;
 
-// If the native format is reqested, has to be reset at the
+// If the native format is requested, has to be reset at the
 // end of the flag. Is solely in the sw/ndgrf.cxx used when
 // the link is removed form GraphicNode.
 bool bOldNativFormat = bNativFormat;
diff --git a/sfx2/source/appl/helpinterceptor.cxx 
b/sfx2/source/appl/helpinterceptor.cxx
index 7a44fc1..4840f57 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -256,7 +256,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
 {
 HelpHistoryEntry_Impl* pEntry = m_pHistory->at( nPos );
 if ( pEntry )
-m_pWindow->loadHelpContent(pEntry->aURL, false); // false 
=> dont add item to history again!
+m_pWindow->loadHelpContent(pEntry->aURL, false); // false 
=> don't add item to history again!
 }
 
 m_pWindow->UpdateToolbox();
diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
index 572f4ca..b908653 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -416,7 +416,7 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, 
FileDialogHelper*, /*unused
 
 xPickerControls->getValue( 
ExtendedFilePickerElementIds::CHECKBOX_READONLY, 0 ) >>= bReadOnly;
 
-// Only set porperty if readonly is set to TRUE
+// Only set property if readonly is set to TRUE
 
 if ( bReadOnly )
 {
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 64c0dcb..c25d239 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -210,7 +210,7 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
 // add the bits blocks by block
 for ( sal_uInt16 nBlock = 0; nBlock < nMax; ++nBlock )
 {
-// compute numberof additional bits
+// compute number of additional bits
 sal_uInt32 nDiff = ~*(pBitmap+nBlock) & *(rSet.pBitmap+nBlock);
 nCount = nCount + CountBits(nDiff);
 
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 8da50c8..e4116ea 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -216,7 +216,7 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( 
const OUString& rNam
 OUString sServiceName   = aOpt.GetFactoryName(eFactory);
 OUString sDefaultFilter = aOpt.GetFactoryDefaultFilter(eFactory);
 
-// Try to get the default filter. Dont fiorget to verify it.
+// Try to get the default filter. Don't forget to verify it.
 // May the set default filter does not exists any longer or
 // does not fit the given factory.
 const SfxFilterMatcher aMatcher;
@@ -477,7 +477,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( 
SfxMedium& rMedium, c

[Libreoffice-commits] core.git: sc/source sc/workben sdext/source sd/source

[Andrea Gelmini]

 sc/source/ui/view/tabview.cxx  |8 
 sc/source/ui/view/tabview3.cxx |2 +-
 sc/source/ui/view/tabview5.cxx |2 +-
 sc/source/ui/view/tabvwsh4.cxx |2 +-
 sc/source/ui/view/tabvwshb.cxx |2 +-
 sc/workben/addin.cxx   |2 +-
 sd/source/core/CustomAnimationEffect.cxx   |2 +-
 sd/source/ui/accessibility/AccessibleViewForwarder.cxx |2 +-
 sd/source/ui/dlg/brkdlg.cxx|2 +-
 sdext/source/pdfimport/tree/style.cxx  |2 +-
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx  |2 +-
 sdext/source/presenter/PresenterNotesView.hxx  |2 +-
 sdext/source/presenter/PresenterPaneBorderPainter.hxx  |2 +-
 sdext/source/presenter/PresenterPaneFactory.hxx|4 ++--
 sdext/source/presenter/PresenterSlideShowView.hxx  |2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 185f207ef17d58ea81d0c17c1a37cf14647cc71a
Author: Andrea Gelmini 
Date:   Tue Sep 29 17:58:05 2015 +0200

Fix typos

Change-Id: I3ea8a90f0ec917b4e26335fcd31a5f7e0888589e
Reviewed-on: https://gerrit.libreoffice.org/18972
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 87d0f09..88787fd 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -527,7 +527,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& 
rSize, bool bInner )
 }
 }
 
-//  SetDragRectPixel also whithout Scrollbars etc., when already split
+//  SetDragRectPixel also without Scrollbars etc., when already split
 if ( bHScroll || aViewData.GetHSplitMode() != SC_SPLIT_NONE )
 pHSplitter->SetDragRectPixel(
 Rectangle( nPosX, nPosY, nPosX+nSizeX, nPosY+nSizeY ), pFrameWin );
@@ -1132,7 +1132,7 @@ IMPL_LINK_TYPED( ScTabView, ScrollHdl, ScrollBar*, 
pScroll, void )
 break;
 case SCROLL_DRAG:
 {
-// only scroll in the corret direction, do not jitter around 
hidden ranges
+// only scroll in the correct direction, do not jitter around 
hidden ranges
 long nScrollMin = 0;// simulate RangeMin
 if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == 
aHScrollRight.get() )
 nScrollMin = aViewData.GetFixPosX();
@@ -1352,8 +1352,8 @@ namespace
 SCROW lcl_LastVisible( ScViewData& rViewData )
 {
 // If many rows are hidden at end of the document (what kind of idiot does 
that?),
-// then there should not be a switch to wide row headers beacause of this
-//! as a member to the document ???
+// then there should not be a switch to wide row headers because of this
+//! as a member to the document???
 ScDocument* pDoc = rViewData.GetDocument();
 SCTAB nTab = rViewData.GetTabNo();
 
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 1b84422..fc5df52 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1883,7 +1883,7 @@ void ScTabView::KillEditView( bool bNoPaint )
 {
 //  should be done like this, so that Sfx notice it, but it does not work:
 //! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus();
-//  therfore first like this:
+//  therefore first like this:
 GetActiveWin()->GrabFocus();
 }
 
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index c3f5516..9887de0 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -472,7 +472,7 @@ void ScTabView::DrawEnableAnim(bool bSet)
 sal_uInt16 i;
 if ( pDrawView )
 {
-//  dont start animations if display of graphics is disabled
+//  don't start animations if display of graphics is disabled
 //  graphics are controlled by VOBJ_TYPE_OLE
 if ( bSet && aViewData.GetOptions().GetObjMode(VOBJ_TYPE_OLE) == 
VOBJ_MODE_SHOW )
 {
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 408687a..67d5a39 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1628,7 +1628,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode 
)
 pDocSh->SetUpdateEnabled(false);
 
 if ( GetViewFrame()->GetFrame().IsInPlace() )
-UpdateHeaderWidth(); // The implace activation requires headers to be 
calculated
+UpdateHeaderWidth(); // The inplace activation requires headers to be 
calculated
 
 SvBorder aBorder;
 GetBorderSize( aBorder, Size() );
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 3dc426e..c92fc55 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -265,7 +265,7 @@ vo

[Libreoffice-commits] core.git: sc/source

[Andrea Gelmini]

 sc/source/filter/oox/defnamesbuffer.cxx   |4 ++--
 sc/source/filter/oox/pivotcachebuffer.cxx |2 +-
 sc/source/filter/oox/revisionfragment.cxx |2 +-
 sc/source/filter/oox/sheetdatabuffer.cxx  |2 +-
 sc/source/filter/oox/viewsettings.cxx |2 +-
 sc/source/filter/starcalc/scflt.cxx   |2 +-
 sc/source/ui/app/inputhdl.cxx |2 +-
 sc/source/ui/app/uiitems.cxx  |2 +-
 sc/source/ui/docshell/docsh.cxx   |2 +-
 sc/source/ui/docshell/docsh4.cxx  |2 +-
 sc/source/ui/drawfunc/fudraw.cxx  |2 +-
 sc/source/ui/inc/csvcontrol.hxx   |2 +-
 sc/source/ui/navipi/navipi.cxx|4 ++--
 sc/source/ui/unoobj/chart2uno.cxx |2 +-
 sc/source/ui/unoobj/confuno.cxx   |2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 7de7eeff1c92427262a2400c69daf2c84cffe088
Author: Andrea Gelmini 
Date:   Tue Sep 29 17:57:36 2015 +0200

Fix typos

Change-Id: I532c635d2dd2ba58bb6dba6422cb50dfac32fcc5
Reviewed-on: https://gerrit.libreoffice.org/18970
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 20bb852..a1811d7 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -95,7 +95,7 @@ OUString lclGetPrefixedName( sal_Unicode cBuiltinId )
 return OUStringBuffer().appendAscii( spcOoxPrefix ).append( 
lclGetBaseName( cBuiltinId ) ).makeStringAndClear();
 }
 
-/** returns the built-in name identifier from a perfixed built-in name, e.g. 
'_xlnm.Print_Area'. */
+/** returns the built-in name identifier from a prefixed built-in name, e.g. 
'_xlnm.Print_Area'. */
 sal_Unicode lclGetBuiltinIdFromPrefixedName( const OUString& rModelName )
 {
 OUString aPrefix = OUString::createFromAscii( spcOoxPrefix );
@@ -248,7 +248,7 @@ void DefinedName::importDefinedName( const AttributeList& 
rAttribs )
 mnCalcSheet = (maModel.mnSheet >= 0) ? getWorksheets().getCalcSheetIndex( 
maModel.mnSheet ) : -1;
 
 /*  Detect built-in state from name itself, there is no built-in flag.
-Built-in names are prexixed with '_xlnm.' instead. */
+Built-in names are prefixed with '_xlnm.' instead. */
 mcBuiltinId = lclGetBuiltinIdFromPrefixedName( maModel.maName );
 }
 
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx 
b/sc/source/filter/oox/pivotcachebuffer.cxx
index 64da525..704b098 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -891,7 +891,7 @@ OUString PivotCacheField::createParentGroupField( const 
Reference< XDataPilotFie
 /*  Find the group object and the auto-generated group name.
 The returned field contains all groups derived from the
 previous field if that is grouped too. To find the correct
-group, the first item used to create the group is serached.
+group, the first item used to create the group is searched.
 Calc provides the original item names of the base field
 when the group is querried for its members. Its does not
 provide the names of members that are already groups in the
diff --git a/sc/source/filter/oox/revisionfragment.cxx 
b/sc/source/filter/oox/revisionfragment.cxx
index 14fb06f..db15193 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -262,7 +262,7 @@ void RevisionHeadersFragment::finalizeImport()
 if (aPath.isEmpty())
 continue;
 
-// Parse each reivison log fragment.
+// Parse each revision log fragment.
 const RevisionMetadata& rData = it->second;
 pCT->SetUser(rData.maUserName);
 pCT->SetFixDateTimeLocal(rData.maDateTime);
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 812eee1..1fd0788 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -374,7 +374,7 @@ void SheetDataBuffer::addColXfStyle( sal_Int32 nXfId, 
sal_Int32 nFormatId, const
 // the range style Rows into sections ( to
 // occupy only rows that have no style definition )
 
-// We dont want to set any rowstyle 'rows'
+// We don't want to set any rowstyle 'rows'
 // for rows where there is an existing 'style' )
 std::vector< RowRangeStyle > aRangeRowsSplits;
 
diff --git a/sc/source/filter/oox/viewsettings.cxx 
b/sc/source/filter/oox/viewsettings.cxx
index 05a70fc..fae3067 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -375,7 +375,7 @@ void SheetViewSettings::finalizeImport()
 {
 /*  Frozen panes: handle split position as row/column positions.
  

[Libreoffice-commits] core.git: sfx2/source shell/source

[Andrea Gelmini]

 sfx2/source/doc/docfile.cxx|2 +-
 sfx2/source/doc/guisaveas.cxx  |4 ++--
 sfx2/source/doc/new.cxx|2 +-
 sfx2/source/doc/objmisc.cxx|2 +-
 sfx2/source/doc/objstor.cxx|2 +-
 sfx2/source/doc/objxtor.cxx|2 +-
 sfx2/source/doc/oleprops.hxx   |2 +-
 sfx2/source/doc/printhelper.cxx|2 +-
 sfx2/source/doc/sfxbasemodel.cxx   |4 ++--
 sfx2/source/menu/thessubmenu.hxx   |2 +-
 sfx2/source/view/frmload.cxx   |2 +-
 sfx2/source/view/viewfrm.cxx   |4 ++--
 sfx2/source/view/viewsh.cxx|2 +-
 shell/source/cmdmail/cmdmailsuppl.cxx  |2 +-
 shell/source/tools/lngconvex/lngconvex.cxx |2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 04724c97b385d22b9db73c9d078a88fbbe019760
Author: Andrea Gelmini 
Date:   Tue Sep 29 17:58:49 2015 +0200

Fix typos

Change-Id: Ibf70cbce0d280ab4686062a4e110c7c9bb54791c
Reviewed-on: https://gerrit.libreoffice.org/18976
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 0205740..26f4820 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1281,7 +1281,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( 
bool bCreateTempIfNo )
 if ( pImp->aVersions.getLength() )
 {
 // Search for the version fits the comment
-// The versions are numbered startign with 1, versions with
+// The versions are numbered starting with 1, versions with
 // negative versions numbers are counted backwards from the
 // current version
 short nVersion = pVersion ? pVersion->GetValue() : 0;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 234888b..8d3f492 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1071,7 +1071,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 
nStoreMode,
 
 if ( aFilterName.equals( aFilterFromMediaDescr ) )
 {
-// preserv current settings if any
+// preserve current settings if any
 // if there no current settings and the name is the same
 // as old filter name use old filter settings
 
@@ -1815,7 +1815,7 @@ void SfxStoringHelper::SetDocInfoState(
 }
 }
 
-// sigh... have to set these manually i'm afraid... wonder why
+// sigh... have to set these manually I'm afraid... wonder why
 // SfxObjectShell doesn't handle this internally, should be easier
 xDocPropsToFill->setAuthor(i_xOldDocProps->getAuthor());
 xDocPropsToFill->setGenerator(i_xOldDocProps->getGenerator());
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index c89044e..93121aa 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -285,7 +285,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect)
 
 IMPL_LINK_NOARG_TYPED( SfxNewFileDialog_Impl, DoubleClick, ListBox&, void )
 {
-// Still loadning
+// Still loading
 if ( !xDocShell.Is() || !xDocShell->GetProgress() )
 pAntiImpl->EndDialog(RET_OK);
 }
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index b838f14..bebf3c2 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -780,7 +780,7 @@ OUString SfxObjectShell::GetTitle
 (remote =>:: com:: sun:: star:: util:: URL)
 
 3 (==SFX_TITLE_APINAME)
-provides the logical filname without path
+provides the logical filename without path
 and extension
 
 4 (==SFX_TITLE_DETECT)
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index d5bc6d0..312b440 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2512,7 +2512,7 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs 
)
 pSet->Put( *pComments );
 }
 
-// create a medium as a copy; this medium is only for writingm, because it
+// create a medium as a copy; this medium is only for writing, because it
 // uses the same name as the original one writing is done through a copy,
 // that will be transferred to the target (of course after calling 
HandsOff)
 SfxMedium* pMediumTmp = new SfxMedium( pRetrMedium->GetName(), 
pRetrMedium->GetOpenMode(), pFilter, pSet );
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 9f73e87..8ac27a5 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -325,7 +325,7 @@ SfxObjectShell::SfxObjectShell
 
 SfxObjectCreateMode::ORGANIZER
 

[Libreoffice-commits] core.git: svgio/source svl/source svtools/inc svtools/source

[Andrea Gelmini]

 svgio/source/svgreader/svgsvgnode.cxx   |2 +-
 svl/source/filerec/filerec.cxx  |4 ++--
 svl/source/items/itempool.cxx   |4 ++--
 svl/source/items/poolio.cxx |2 +-
 svl/source/numbers/zforscan.cxx |2 +-
 svtools/inc/table/tablecontrolinterface.hxx |2 +-
 svtools/source/brwbox/datwin.hxx|4 ++--
 svtools/source/config/test/test.cxx |2 +-
 svtools/source/contnr/treelistbox.cxx   |2 +-
 svtools/source/control/tabbar.cxx   |2 +-
 svtools/source/dialogs/addresstemplate.cxx  |2 +-
 svtools/source/misc/ehdl.cxx|2 +-
 svtools/source/misc/imagemgr.cxx|8 
 svtools/source/misc/sampletext.cxx  |2 +-
 svtools/source/svrtf/parrtf.cxx |2 +-
 15 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit d6e82846ce8bdd21db4a4aa783555950f0a8e442
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:09:46 2015 +0200

Fix typos

Change-Id: Icd2055ee1f941383d0338ea3515a9fbb6db1712a
Reviewed-on: https://gerrit.libreoffice.org/18979
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svgio/source/svgreader/svgsvgnode.cxx 
b/svgio/source/svgreader/svgsvgnode.cxx
index f33961b..2a98b75 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -322,7 +322,7 @@ namespace svgio
 // bounding box width or height on a given object (refer 
to the section that describes object
 // bounding box units)."
 
-// Comparisons with commom browsers show, that it's mostly 
interpreted relative to the viewport
+// Comparisons with common browsers show that it's mostly 
interpreted relative to the viewport
 // of the parent, and so does the new implementation.
 
 // Extract known viewport data
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index c703193..ef53860 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -129,7 +129,7 @@ bool SfxMiniRecordReader::SetHeader_Impl( sal_uInt32 
nHeader )
  * This constructor interprets a 'pStream' from the current position
  * as a continuous sequence of records that should be parsable by
  * this group of classes. The first record that is an 
- * (possibly an extened-Record> that has the PreTag 'nTag' will be opened
+ * (possibly an extended-Record> that has the PreTag 'nTag' will be opened
  * and represented by this instance.
  *
  * If the end of stream is reached or a record with tag
@@ -459,7 +459,7 @@ sal_uInt32 SfxMultiVarRecordWriter::Close( bool 
bSeekToEndOfRec )
  * @param nContentVer  content version
  *
  * With this method new Content is added to a record and
- * its tag and version are regorded. This method must be called
+ * its tag and version are recorded. This method must be called
  * to start each content, including the first record.
  */
 void SfxMultiMixRecordWriter::NewContent(sal_uInt16 nContentTag, sal_uInt8 
nContentVer)
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 20b9e3a..909c650 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -880,10 +880,10 @@ const SfxPoolItem& SfxItemPool::GetDefaultItem( 
sal_uInt16 nWhich ) const
 {
 if ( pImp->mpSecondary )
 return pImp->mpSecondary->GetDefaultItem( nWhich );
-assert(!"unknown which - dont ask me for defaults");
+assert(!"unknown which - don't ask me for defaults");
 }
 
-DBG_ASSERT( pImp->ppStaticDefaults, "no defaults known - dont ask me for 
defaults" );
+DBG_ASSERT( pImp->ppStaticDefaults, "no defaults known - don't ask me for 
defaults" );
 sal_uInt16 nPos = GetIndex_Impl(nWhich);
 SfxPoolItem *pDefault = *(pImp->ppPoolDefaults + nPos);
 if ( pDefault )
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index bed569a..619f9ca 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -892,7 +892,7 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem 
*pItem) const
 {
 if ( pImp->mpSecondary )
 return pImp->mpSecondary->GetSurrogate( pItem );
-SFX_ASSERT( false, pItem->Which(), "unknown Which-Id - dont ask me for 
surrogates" );
+SFX_ASSERT( false, pItem->Which(), "unknown Which-Id - don't ask me 
for surrogates" );
 }
 
 // Pointer on static or pool-default attribute?
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index fb0ddef..2fd6aaa 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -438,7 +438,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 break;
 }
 
-// boolean keyords
+// boolean keywords
 InitSpecialKeyword( NF_KEY_TRUE );
 InitSpecialKey

[Libreoffice-commits] core.git: svtools/source svx/inc svx/source

[Andrea Gelmini]

 svtools/source/table/tablecontrol_impl.hxx  |2 +-
 svtools/source/toolpanel/drawerlayouter.cxx |2 +-
 svx/inc/AccessibleTableShape.hxx|2 +-
 svx/inc/float3d.hrc |2 +-
 svx/inc/sdr/overlay/overlaytools.hxx|2 +-
 svx/source/accessibility/AccessibleControlShape.cxx |2 +-
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |2 +-
 svx/source/dialog/charmap.cxx   |2 +-
 svx/source/dialog/graphctl.cxx  |2 +-
 svx/source/dialog/measctrl.cxx  |2 +-
 svx/source/dialog/svxruler.cxx  |2 +-
 svx/source/engine3d/view3d.cxx  |6 +++---
 svx/source/fmcomp/fmgridcl.cxx  |2 +-
 svx/source/fmcomp/gridctrl.cxx  |4 ++--
 svx/source/form/filtnav.cxx |2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit f0733ee8c9de62818867c656518cecf0986dda0f
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:09:57 2015 +0200

Fix typos

Change-Id: I7bb3caf76909603343f50568b68e3eadeb1cac30
Reviewed-on: https://gerrit.libreoffice.org/18980
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svtools/source/table/tablecontrol_impl.hxx 
b/svtools/source/table/tablecontrol_impl.hxx
index e34672a..d082e20 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -82,7 +82,7 @@ namespace svt { namespace table
 friend class SuspendInvariants;
 
 private:
-/// the control whose impl-instance we implemnt
+/// the control whose impl-instance we implement
 TableControl&   m_rAntiImpl;
 /// the model of the table control
 PTableModel m_pModel;
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx 
b/svtools/source/toolpanel/drawerlayouter.cxx
index 55be1a2..6ff118a 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -92,7 +92,7 @@ namespace svt
 aLowerDrawerPos.Move( 0, -nDrawerHeight );
 }
 
-// fincally calculate the rectangle for the active panel
+// finally calculate the rectangle for the active panel
 return Rectangle(
 aUpperDrawerPos,
 Size( nWidth, aLowerDrawerPos.Y() - aUpperDrawerPos.Y() + 1 )
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index 1c704ec..4440534 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -133,7 +133,7 @@ public:
 // overwrite the SetState & ResetState to do special operation for table 
cell's internal text
 virtual bool SetState (sal_Int16 aState) SAL_OVERRIDE;
 virtual bool ResetState (sal_Int16 aState) SAL_OVERRIDE;
-// The following two methods are used to set state directly on table 
object, instread of the internal cell or paragraph.
+// The following two methods are used to set state directly on table 
object, instead of the internal cell or paragraph.
 bool SetStateDirectly (sal_Int16 aState);
 bool ResetStateDirectly (sal_Int16 aState);
 // Get the currently active cell which is text editing
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index d73219f..6f16074 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -33,7 +33,7 @@
 #define CTL_PREVIEW 12
 #define CTL_LIGHT_PREVIEW   13
 
-// Geomerty
+// Geometry
 #define FT_HORIZONTAL   24
 #define NUM_HORIZONTAL  25
 #define FT_VERTICAL 26
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx 
b/svx/inc/sdr/overlay/overlaytools.hxx
index 9a6f9fe..9e74d68 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -172,7 +172,7 @@ namespace drawinglayer
 basegfx::BColor maColor;
 double  mfTransparence;
 
-// the dscrete grow and shrink of the box
+// the discrete grow and shrink of the box
 double  mfDiscreteGrow;
 double  mfDiscreteShrink;
 
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx 
b/svx/source/accessibility/AccessibleControlShape.cxx
index fe3af84..4432e0e 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -666,7 +666,7 @@ void SAL_CALL AccessibleControlShape::disposing()
 }
 }
 
-// forward the disposel to our inner context
+// forward the disposal to our inner context
 if ( m_bDisposeNativeContext )
 {
 // don't listen for mode changes anymore
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork

[Libreoffice-commits] core.git: svx/source swext/mediawiki sw/inc

[Andrea Gelmini]

 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx|2 +-
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |2 +-
 svx/source/svdraw/svddrgmt.cxx   |2 +-
 svx/source/svdraw/svdmrkv.cxx|2 +-
 svx/source/svdraw/svdotextdecomposition.cxx  |2 +-
 svx/source/svdraw/textchainflow.cxx  |2 +-
 svx/source/table/tablecontroller.cxx |4 ++--
 svx/source/table/tablelayouter.cxx   |2 +-
 svx/source/table/tablemodel.cxx  |2 +-
 svx/source/table/viewcontactoftableobj.cxx   |2 +-
 svx/source/unodraw/unoshtxt.cxx  |2 +-
 sw/inc/cmdid.h   |2 +-
 sw/inc/crsrsh.hxx|2 +-
 sw/inc/editsh.hxx|2 +-
 swext/mediawiki/src/filter/odt2mediawiki.xsl |6 +++---
 15 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 2de378ecacd95d7ac52275b34f3fda281d477dbe
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:10:33 2015 +0200

Fix typos

Change-Id: I92f9eda138c387dde3095e1a6281bdcec3a2adde
Reviewed-on: https://gerrit.libreoffice.org/18982
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx 
b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index f1c7e35..761a9c8 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -211,7 +211,7 @@ drawinglayer::primitive2d::Primitive2DSequence 
ViewObjectContactOfPageObj::creat
 // #i102637# add gray frame also when printing and page exists (handout 
pages)
 const bool bCreateGrayFrame(!GetObjectContact().isOutputToPrinter() || 
pPage);
 
-// get displayed page's content. This is the uscaled page content
+// get displayed page's content. This is the unscaled page content
 if(mpExtractor && pPage)
 {
 // get displayed page's geometry
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx 
b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 9f00a32..1147704 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -692,7 +692,7 @@ namespace sdr { namespace contact {
 
 /** adjusts the control visibility so it respects its layer's 
visibility
 
-The control must never be visibile if it's in design mode.
+The control must never be visible if it's in design mode.
 In alive mode, it must be visibility if and only it's on a visible 
layer.
 
 @param _rxControl
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 77dd081..9274c3e 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -4022,7 +4022,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/)
 double fScaleY = ( aGraphicSize.Height() - rOldCrop.GetTop() - 
rOldCrop.GetBottom() ) / (double)aOldRect.GetHeight();
 
 // not needed since the modification is done in unit coordinates, free 
from shear/rotate and mirror
-// //  may be removed or exhanged by other stuff in aw080
+// //  may be removed or exchanged by other stuff in aw080
 // // to correct the never working combination of cropped images and 
mirroring
 // // I have to correct the rectangles the calculation is based on here. 
In the current
 // // core geometry stuff a vertical mirror is expressed as 180 degree 
rotation. All
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index dbb3582..112fcea 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -679,7 +679,7 @@ void SdrMarkView::SetMarkHandles()
 {
 // formally #i33755#: If TextEdit is active the EditEngine will 
directly paint
 // to the window, so suppress Overlay and handles completely; a 
text frame for
-// the active text edit will be painted by the repaitnt mechanism 
in
+// the active text edit will be painted by the repaint mechanism in
 // SdrObjEditView::ImpPaintOutlinerView in this case. This needs 
to be reworked
 // in the future
 // Also formally #122142#: Pretty much the same for 
SdrCaptionObj's in calc.
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index e946be3..9533e9e 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1438,7 +1438,7 @@ void 
SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutlin
 aTxtChainFlow.ExecuteUnderflow(&rOutliner);
 bIsOverflow = aTxtChainFlow.IsOverflow(

[Libreoffice-commits] core.git: chart2/source connectivity/source editeng/source extensions/source filter/source forms/source framework/source idl/source

[Oliver Specht]

 chart2/source/controller/main/ChartController_TextEdit.cxx  |2 
 chart2/source/controller/main/ChartController_Window.cxx|2 
 chart2/source/controller/main/DrawCommandDispatch.cxx   |8 +-
 chart2/source/controller/main/SelectionHelper.cxx   |4 -
 chart2/source/view/diagram/VDiagram.cxx |2 
 connectivity/source/drivers/dbase/DIndexIter.cxx|2 
 connectivity/source/drivers/file/FNoException.cxx   |2 
 connectivity/source/drivers/file/fanalyzer.cxx  |2 
 connectivity/source/drivers/file/fcode.cxx  |   27 
 connectivity/source/drivers/file/fcomp.cxx  |8 +-
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |6 -
 editeng/source/editeng/editview.cxx |2 
 editeng/source/editeng/impedit2.cxx |2 
 editeng/source/editeng/impedit3.cxx |8 +-
 editeng/source/editeng/impedit5.cxx |4 -
 editeng/source/items/bulitem.cxx|2 
 editeng/source/items/xmlcnitm.cxx   |2 
 editeng/source/outliner/outlvw.cxx  |2 
 extensions/source/propctrlr/standardcontrol.cxx |2 
 filter/source/msfilter/escherex.cxx |8 +-
 filter/source/msfilter/msdffimp.cxx |4 -
 filter/source/msfilter/svdfppt.cxx  |   38 ++--
 filter/source/pdf/pdfexport.cxx |2 
 forms/source/richtext/rtattributehandler.cxx|   18 ++---
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |2 
 idl/source/objects/slot.cxx |6 -
 26 files changed, 84 insertions(+), 83 deletions(-)

New commits:
commit ac9671f94800b647f82b12e718968311a025e87e
Author: Oliver Specht 
Date:   Tue Sep 29 11:00:09 2015 +0200

 tdf#94559: second step to remove rtti.hxx

replaced use of PTR_CAST, IS_TYPE, ISA in
chart2, connectivity, editeng, extensions, filter, forms, framework, idl

Change-Id: I6a2f9d8bbccb07088413f7552af4b5af8f0cad99
Reviewed-on: https://gerrit.libreoffice.org/18920
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx 
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index cfa9f04..647471d 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -177,7 +177,7 @@ void 
ChartController::executeDispatch_InsertSpecialCharacter()
 const SfxPoolItem* pItem=0;
 OUString aString;
 if ( pSet && pSet->GetItemState( SID_CHARMAP, true, &pItem) == 
SfxItemState::SET &&
- pItem->ISA(SfxStringItem) )
+ dynamic_cast< const SfxStringItem* >(pItem) !=  nullptr )
 aString = dynamic_cast(pItem)->GetValue();
 
 OutlinerView* pOutlinerView = 
m_pDrawViewWrapper->GetTextEditOutlinerView();
diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index ea7fd10..2089aa1 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -907,7 +907,7 @@ void ChartController::execute_DoubleClick( const Point* 
pMousePixel )
 {
 // #i12587# support for shapes in chart
 SdrObject* pObj = DrawViewWrapper::getSdrObject( 
m_aSelection.getSelectedAdditionalShape() );
-if ( pObj && pObj->ISA( SdrTextObj ) )
+if ( dynamic_cast< const SdrTextObj* >(pObj) !=  nullptr )
 {
 bEditText = true;
 }
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx 
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index ac0f1fd..e0d9bd28 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -466,7 +466,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const 
sal_uInt16 nID )
 case COMMAND_ID_DRAW_LINE:
 case COMMAND_ID_LINE_ARROW_END:
 {
-if ( pObj->ISA( SdrPathObj ) )
+if ( dynamic_cast( pObj) !=  
nullptr )
 {
 Point aStart = aRect.TopLeft();
 Point aEnd = aRect.BottomRight();
@@ -483,7 +483,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const 
sal_uInt16 nID )
 break;
 case COMMAND_ID_DRAW_FREELINE_NOFILL:
 {
-if ( pObj->ISA( SdrPathObj ) )
+

[Libreoffice-commits] core.git: unotools/source unoxml/qa unoxml/source vcl/generic vcl/headless vcl/inc vcl/opengl vcl/osx

[Andrea Gelmini]

 unotools/source/config/viewoptions.cxx  |6 +++---
 unoxml/qa/complex/unoxml/RDFRepositoryTest.java |6 +++---
 unoxml/source/events/eventdispatcher.cxx|6 +++---
 unoxml/source/rdf/librdf_repository.cxx |2 +-
 vcl/generic/fontmanager/fontconfig.cxx  |2 +-
 vcl/generic/fontmanager/fontmanager.cxx |2 +-
 vcl/generic/print/common_gfx.cxx|2 +-
 vcl/headless/svpframe.cxx   |2 +-
 vcl/inc/generic/printergfx.hxx  |2 +-
 vcl/inc/salsession.hxx  |2 +-
 vcl/inc/svdata.hxx  |2 +-
 vcl/inc/unx/salgdi.h|2 +-
 vcl/inc/unx/saltype.h   |2 +-
 vcl/opengl/win/WinDeviceInfo.cxx|2 +-
 vcl/osx/salframe.cxx|2 +-
 15 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 53e6ac15a14b46c76049a9e6eb39da7bb4093037
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:12:38 2015 +0200

Fix typos

Change-Id: Ia7394ab3c0aa28002a7022e73c2b7d9eb73dacb8
Reviewed-on: https://gerrit.libreoffice.org/18991
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/unotools/source/config/viewoptions.cxx 
b/unotools/source/config/viewoptions.cxx
index d1d940a..83e2d04 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -80,7 +80,7 @@ sal_Int32
SvtViewOptions::m_nRefCount_Windows =   0
 But not every superclass should use them! Because some 
view types don't
 have it really.
 
-@attention  We implement a write-througt-cache! We use it for reading 
- but write all changes directly to
+@attention  We implement a write-through cache! We use it for reading 
- but write all changes directly to
 configuration. (changes are made on internal cache too!). 
So it's easier to distinguish
 between added/changed/removed elements without any complex 
mask or bool flag information.
 Caches from configuration and our own one are synchronized 
every time - if we do so.
@@ -186,7 +186,7 @@ SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const 
OUString& sList )
 
*//*-*/
 SvtViewOptionsBase_Impl::~SvtViewOptionsBase_Impl()
 {
-// dont flush configuration changes here to m_xRoot.
+// don't flush configuration changes here to m_xRoot.
 // That must be done inside every SetXXX() method already !
 // Here its to late - DisposedExceptions from used configuration access 
can occur otherwise.
 
@@ -322,7 +322,7 @@ css::uno::Sequence< css::beans::NamedValue > 
SvtViewOptionsBase_Impl::GetUserDat
 {
 css::uno::Reference< css::container::XNameAccess > xNode(
 impl_getSetNode(sName, false),
-css::uno::UNO_QUERY); // no _THROW ! because we dont create 
missing items here. So we have to live with zero references .-)
+css::uno::UNO_QUERY); // no _THROW ! because we don't create 
missing items here. So we have to live with zero references .-)
 css::uno::Reference< css::container::XNameAccess > xUserData;
 if (xNode.is())
 xNode->getByName(PROPERTY_USERDATA) >>= xUserData;
diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java 
b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
index ba2bdfd..e9dbb37 100644
--- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
+++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
@@ -103,10 +103,10 @@ public class RDFRepositoryTest
 assertNotNull("uint", uint);
 blank = BlankNode.create(xContext, "_:uno");
 assertNotNull("blank", blank);
-lit = Literal.create(xContext, "i am the literal");
+lit = Literal.create(xContext, "I am the literal");
 assertNotNull("lit", lit);
 litlang = Literal.createWithLanguage(xContext,
-"i am the literal", "en");
+"I am the literal", "en");
 assertNotNull("litlang", litlang);
 littype = Literal.createWithType(xContext, "42", uint);
 assertNotNull("littype", littype);
@@ -441,7 +441,7 @@ public class RDFRepositoryTest
 try {
 System.out.println("Checking RDFa gunk...");
 
-String content = "behold, for i am the content.";
+String content = "behold, for I am the content.";
 XTextRange xTR = new TestRange(content);
 XMetadatable xM = (XMetadatable) xTR;
 
diff --git a/unoxml/source/events/eventdispatcher.cxx 
b/unoxml/source/events/eventdispatcher.cxx
index ae53ae2..04051f2 100644
--- a/unoxml/source/events/eventdispatcher.cxx
+++ b/unoxml/source/events/eventdispatcher.cx

[Libreoffice-commits] core.git: chart2/source

[Andrea Gelmini]

 chart2/source/controller/dialogs/Strings.src  |2 +-
 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |2 +-
 chart2/source/controller/main/ChartController.cxx |2 +-
 chart2/source/controller/main/ChartController_Window.cxx  |2 +-
 chart2/source/controller/main/ChartDropTargetHelper.cxx   |2 +-
 chart2/source/controller/main/ObjectHierarchy.cxx |2 +-
 chart2/source/controller/main/SelectionHelper.cxx |2 +-
 chart2/source/inc/LifeTime.hxx|2 +-
 chart2/source/inc/ObjectIdentifier.hxx|2 +-
 chart2/source/inc/RegressionCalculationHelper.hxx |4 ++--
 chart2/source/inc/WeakListenerAdapter.hxx |2 +-
 chart2/source/inc/chartview/ExplicitValueProvider.hxx |2 +-
 chart2/source/tools/ThreeDHelper.cxx  |2 +-
 chart2/source/view/charttypes/PieChart.cxx|4 ++--
 chart2/source/view/main/ChartView.cxx |2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit a6e622480f4cbc9bef65561984810298f317f709
Author: Andrea Gelmini 
Date:   Tue Sep 29 17:45:40 2015 +0200

Fix typos

Change-Id: Icf15b5ea2e5b9cd62645bab2f9ccaada948322a7
Reviewed-on: https://gerrit.libreoffice.org/18940
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/chart2/source/controller/dialogs/Strings.src 
b/chart2/source/controller/dialogs/Strings.src
index d783e05..c9d18eb 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -473,7 +473,7 @@ String STR_ROW_LABEL
 Text [ en-US ] = "Row %ROWNUMBER" ;
 };
 
-//for range didalog
+//for range dialog
 String STR_DATA_ROLE_LABEL
 {
 Text [ en-US ] = "Name" ;
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx 
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 946bb70..bed7ed6 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -176,7 +176,7 @@ void ObjectPropertiesDialogParameter::init( const 
uno::Reference< frame::XModel
 m_bShowAxisOrigin = true;
 }
 
-//is the crossin main axis a category axes?:
+//is the crossing main axis a category axes?:
 uno::Reference< XCoordinateSystem > xCooSys( 
AxisHelper::getCoordinateSystemOfAxis( xAxis, xDiagram ) );
 uno::Reference< XAxis > xCrossingMainAxis( 
AxisHelper::getCrossingMainAxis( xAxis, xCooSys ) );
 if( xCrossingMainAxis.is() )
diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 4b31bb2..c5999ac 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -210,7 +210,7 @@ void ChartController::TheModel::tryTermination()
 {
 //@todo ? are we allowed to use sal_True here if we have the 
explicit ownership?
 //I think yes, because there might be other closelistners 
later in the list which might be interested still
-//but make sure that we do not throw the CloseVetoException 
here ourselfs
+//but make sure that we do not throw the CloseVetoException 
here ourselves
 //so stop listening before trying to terminate or check the 
source of queryclosing event
 m_xCloseable->close(sal_True);
 
diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index dd6ccaf4..ea7fd10 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1775,7 +1775,7 @@ bool ChartController::impl_moveOrResizeObject(
 {
 ControllerLockGuardUNO aCLGuard( xChartModel );
 xObjProp->setPropertyValue( "RelativePosition", uno::makeAny( 
aRelPos ));
-if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also 
set an explicat size at the diagram when an explicit position is set
+if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also 
set an explicit size at the diagram when an explicit position is set
 xObjProp->setPropertyValue( "RelativeSize", uno::makeAny( 
aRelSize ));
 }
 aUndoGuard.commit();
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx 
b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index d9722c1..39ffe37 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -149,7 +149,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const 
ExecuteDropEvent& rEvt )

[Libreoffice-commits] core.git: cli_ure/source comphelper/source compilerplugins/clang config_host/config_features.h.in configure.ac connectivity/source

[Andrea Gelmini]

 cli_ure/source/climaker/climaker_emit.cxx|
6 +--
 comphelper/source/container/embeddedobjectcontainer.cxx  |
2 -
 compilerplugins/clang/bodynotinblock.cxx |
2 -
 compilerplugins/clang/simplifybool.cxx   |
2 -
 config_host/config_features.h.in |   
18 +-
 configure.ac |
2 -
 connectivity/source/commontools/parameters.cxx   |
2 -
 connectivity/source/cpool/ZConnectionPool.hxx|
2 -
 connectivity/source/drivers/dbase/DTable.cxx |
2 -
 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |
2 -
 connectivity/source/drivers/file/FResultSet.cxx  |
4 +-
 connectivity/source/drivers/file/quotedstring.cxx|
4 +-
 connectivity/source/drivers/macab/MacabRecords.cxx   |
4 +-
 connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx|
2 -
 connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx |
2 -
 15 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit ce343470c385dc8390bbc4bf3e85457c1d55e0ec
Author: Andrea Gelmini 
Date:   Tue Sep 29 17:46:36 2015 +0200

Fix typos

Change-Id: Iaff7e38dd5beac48e1643e369e4240aa736c35ea
Reviewed-on: https://gerrit.libreoffice.org/18941
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/cli_ure/source/climaker/climaker_emit.cxx 
b/cli_ure/source/climaker/climaker_emit.cxx
index 51bed9a..2ba5c62 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -1369,7 +1369,7 @@ Assembly ^ TypeEmitter::type_resolve(
 code->Emit( Emit::OpCodes::Ldarg_0 );
 code->Emit(
 Emit::OpCodes::Newobj,
-//GetConstructor requies that the member types of the 
object which is to be constructed are already known.
+//GetConstructor requires that the member types of the 
object which is to be constructed are already known.
 field_type->GetConstructor(
 gcnew array< ::System::Type^> ( 0 ) ) );
 code->Emit( Emit::OpCodes::Stfld, field );
@@ -1638,7 +1638,7 @@ Assembly ^ TypeEmitter::type_resolve(
 
 //We create a try/ catch around the createInstanceWithContext, etc. 
functions
 //There are 3 cases
-//1. function do not specify exceptions. Then RuntimeExceptions are 
retrhown and other
+//1. function do not specify exceptions. Then RuntimeExceptions are 
re-thrown and other
 //   exceptions produce a DeploymentException.
 //2. function specify  Exception. Then all exceptions fly through
 //3. function specifies exceptions but no Exception. Then these are 
rethrown
@@ -1829,7 +1829,7 @@ Assembly ^ TypeEmitter::type_resolve(
 //catch (unoidl.com.sun.star.uno.Exception) {throw 
DeploymentException...}
 ilGen->BeginCatchBlock(type_uno_exception);
 
-//Define the local variabe that keeps the exception
+//Define the local variable that keeps the exception
  Emit::LocalBuilder ^ local_exception = ilGen->DeclareLocal(
  type_uno_exception);
 
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 2dbbe7a..caa2d25 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1479,7 +1479,7 @@ bool EmbeddedObjectContainer::StoreChildren(bool 
_bOasisFormat,bool _bObjectsOnl
 //TODO/LATER: only storing if changed!
 //xPersist->storeOwn(); //commented, i120168
 
-// begin:all charts will be persited as xml format on disk when 
saving, which is time consuming.
+// begin:all charts will be persisted as xml format on disk when 
saving, which is time consuming.
 // '_bObjectsOnly' mean we are storing to alien formats.
 //  'isStorageElement' mean current object is NOT an MS 
OLE format. (may also include in future), i120168
 if (_bObjectsOnly && (nCurState == 
embed::EmbedStates::LOADED || nCurState == embed::EmbedStates::RUNNING)
diff --git a/compilerplugins/clang/bodynotinblock.cxx 
b/compilerplugins/clang/bodynotinblock.cxx
index 210aa36..ca4f9049 100644
--- a/compilerplugins/clang/bodynotinblock.cxx
+++ b/compilerplugins/clang/bodynotinblock.cxx
@@ -78,7 +78,7 @@ void BodyNotInBlock::checkBody( const Stmt* body, 
SourceLocation stmtLocation, i
 return;
 // TODO: If the if/else/while/for comes 

[Libreoffice-commits] core.git: accessibility/inc android/source basctl/source basegfx/source basegfx/test basic/source

[Andrea Gelmini]

 accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx  |2 +-
 android/source/src/java/org/libreoffice/LOKitThread.java|4 ++--
 android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java |4 ++--
 basctl/source/basicide/layout.cxx   |2 +-
 basctl/source/basicide/linenumberwindow.cxx |2 +-
 basctl/source/basicide/moduldl2.cxx |2 +-
 basegfx/source/polygon/b2dpolygontools.cxx  |4 ++--
 basegfx/source/polygon/b2dpolygontriangulator.cxx   |2 +-
 basegfx/source/raster/rasterconvert3d.cxx   |2 +-
 basegfx/test/basegfx2d.cxx  |2 +-
 basic/source/basmgr/basmgr.cxx  |2 +-
 basic/source/classes/sb.cxx |2 +-
 basic/source/classes/sbunoobj.cxx   |2 +-
 basic/source/classes/sbxmod.cxx |2 +-
 basic/source/comp/dim.cxx   |2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 9e4c87be31732ed076a059128d2e20451697d225
Author: Andrea Gelmini 
Date:   Tue Sep 29 17:42:11 2015 +0200

Fix typos

Change-Id: Ie0e941d48457d758525353d6c5cf858652f86fd3
Reviewed-on: https://gerrit.libreoffice.org/18938
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx 
b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
index 26fd8c6..9c06af7 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
@@ -37,7 +37,7 @@ typedef ::cppu::ImplHelper3<
 
 /** Base class for list- and combo boxes.  This class manages the box'
 children.  The classed derived from this one have only to implement the
-IsValid method and return the corrent implementation name.
+IsValid method and return the correct implementation name.
 */
 class VCLXAccessibleBox
 : public VCLXAccessibleComponent,
diff --git a/android/source/src/java/org/libreoffice/LOKitThread.java 
b/android/source/src/java/org/libreoffice/LOKitThread.java
index 0da9681..a762184 100644
--- a/android/source/src/java/org/libreoffice/LOKitThread.java
+++ b/android/source/src/java/org/libreoffice/LOKitThread.java
@@ -16,9 +16,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.LinkedBlockingQueue;
 
-/**
+/*
  * Thread that communicates with LibreOffice through LibreOfficeKit JNI 
interface. The thread
- * consumes events from other threads (maininly the UI thread) and acts 
accordingly.
+ * consumes events from other threads (mainly the UI thread) and acts 
accordingly.
  */
 public class LOKitThread extends Thread {
 private static final String LOGTAG = LOKitThread.class.getSimpleName();
diff --git 
a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java 
b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index bb6e3d0..389a50f 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -37,7 +37,7 @@ public class GeckoLayerClient implements PanZoomTarget {
  * Specifically:
  * 1) reading mViewportMetrics from any thread is fine without 
synchronization
  * 2) writing to mViewportMetrics requires synchronizing on the layer 
controller object
- * 3) whenver reading multiple fields from mViewportMetrics without 
synchronization (i.e. in
+ * 3) whenever reading multiple fields from mViewportMetrics without 
synchronization (i.e. in
  *case 1 above) you should always frist grab a local copy of the 
reference, and then use
  *that because mViewportMetrics might get reassigned in between 
reading the different
  *fields. */
@@ -356,4 +356,4 @@ public class GeckoLayerClient implements PanZoomTarget {
 mLowResLayer.invalidateTiles(tilesToInvalidate, rect);
 mRootLayer.invalidateTiles(tilesToInvalidate, rect);
 }
-}
\ No newline at end of file
+}
diff --git a/basctl/source/basicide/layout.cxx 
b/basctl/source/basicide/layout.cxx
index e9b1356..0323340 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -274,7 +274,7 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const& 
rRect)
 // the length of the side
 long const nLength = bVertical ? aRect.GetSize().Height() : 
aRect.GetSize().Width();
 long const nOtherSize = bVertical ? aRect.GetSize().Width() : 
aRect.GetSize().Height();
-// bVertical ? horizontal pozition : vertical pozition
+// bVertical ? horizontal position : vertical position
 long const nPos1 = (bVertical ?

Default LO to show no splash screen?

[Bryan Quigley]

Hi all,

LibreOffice starts up much faster then it once did, to the point I
think the splash screen on startup actually makes it seem like it
takes longer.  Thoughts on removing the splash screen?

Thanks!
Bryan

P.S. Last time I looked at this I believe there was a specific use
case for the splash screen loading dialogue, but from the code I
--nologo would always win...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Andrea Gelmini]

 sw/source/core/frmedt/fecopy.cxx |4 ++--
 sw/source/core/frmedt/fetab.cxx  |2 +-
 sw/source/core/frmedt/tblsel.cxx |2 +-
 sw/source/core/inc/DocumentLayoutManager.hxx |2 +-
 sw/source/core/inc/node2lay.hxx  |2 +-
 sw/source/core/inc/scriptinfo.hxx|2 +-
 sw/source/core/layout/anchoreddrawobject.cxx |2 +-
 sw/source/core/layout/atrfrm.cxx |2 +-
 sw/source/core/layout/flowfrm.cxx|2 +-
 sw/source/core/layout/fly.cxx|2 +-
 sw/source/core/layout/frmtool.cxx|2 +-
 sw/source/core/layout/layact.cxx |4 ++--
 sw/source/core/layout/pagechg.cxx|2 +-
 sw/source/core/layout/pagedesc.cxx   |2 +-
 sw/source/core/layout/paintfrm.cxx   |6 +++---
 15 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit ef1bafb588eb20a5d35df14e79a1a948885c721a
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:11:39 2015 +0200

Fix typos

Change-Id: Ifb7b1f0e4cffb575f6af7437bbca6c4c22a9c00e
Reviewed-on: https://gerrit.libreoffice.org/18985
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index da98b59..df8d852 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -642,7 +642,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& 
rSttPt,
 pDestShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( 
eOldRedlMode );
 mpDoc->SetCopyIsMove( bCopyIsMove );
 
-// have new table formules been inserted?
+// have new table formulas been inserted?
 if( pTableFieldTyp->HasWriterListeners() )
 {
 // finish old actions: the table frames are created and
@@ -661,7 +661,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& 
rSttPt,
 return bRet;
 }
 
-// Paste for  the interal clipboard. Copy the content of the clipboard
+// Paste for the internal clipboard. Copy the content of the clipboard
 // in the document
 namespace {
 typedef std::shared_ptr PaMPtr;
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index f996e1e..8fcd6b3 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -1084,7 +1084,7 @@ sal_uInt16 SwFEShell::GetRowSelectionFromTop() const
  * a follow frame
  *
  * 2. case: bRepeat = false
- * returns true if the current frame is localed inside a table headline OR
+ * returns true if the current frame is located inside a table headline OR
  * inside the first line of a table!!!
  */
 bool SwFEShell::CheckHeadline( bool bRepeat ) const
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 26ef88f..99b4e9e 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -874,7 +874,7 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam )
 
 if( bRet )
 {
-// now check for paragraph bound flyes
+// now check for paragraph bound flies
 const SwFrameFormats& rFormats = *rPam.GetDoc()->GetSpzFrameFormats();
 sal_uLong nSttIdx = rPam.GetPoint()->nNode.GetIndex(),
   nEndIdx = rBox.GetSttNd()->EndOfSectionIndex(),
diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx 
b/sw/source/core/inc/DocumentLayoutManager.hxx
index b6c1441..3258517 100644
--- a/sw/source/core/inc/DocumentLayoutManager.hxx
+++ b/sw/source/core/inc/DocumentLayoutManager.hxx
@@ -38,7 +38,7 @@ public:
 DocumentLayoutManager( SwDoc& i_rSwdoc );
 
 virtual const SwViewShell *GetCurrentViewShell() const SAL_OVERRIDE;
-virtual SwViewShell *GetCurrentViewShell() SAL_OVERRIDE; //< It must be 
able to communicate to a SwViewShell.This is going to be removerd later.
+virtual SwViewShell *GetCurrentViewShell() SAL_OVERRIDE; //< It must be 
able to communicate to a SwViewShell.This is going to be removed later.
 virtual void SetCurrentViewShell( SwViewShell* pNew ) SAL_OVERRIDE;
 
 virtual const SwRootFrm *GetCurrentLayout() const SAL_OVERRIDE;
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 8ae69de..923d02c 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -33,7 +33,7 @@
  *
  * This class is an interface between the method and a SwClientIter: it
  * chooses the right SwModify depending on the task, creates a SwClientIter
- * and filters its iterations depeding on the task.
+ * and filters its iterations depending on the task.
  * The task is determined by the choice of ctor.
  *
  * 1. Collecting the UpperFrms (so that later on it becomes RestoreUpperFrms)
diff --git a/sw/source/core/inc/scriptinfo.hxx 
b/sw/source/core/inc/scriptinfo.hxx
index 5ad950f..ee476ac 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -299,7 +299,7 @@ public:
 /** retrieves ka

[Libreoffice-commits] core.git: sw/source

[Andrea Gelmini]

 sw/source/filter/ww8/ww8par.cxx  |8 
 sw/source/filter/ww8/ww8par5.cxx |2 +-
 sw/source/filter/ww8/ww8par6.cxx |4 ++--
 sw/source/filter/ww8/ww8scan.cxx |4 ++--
 sw/source/filter/ww8/ww8scan.hxx |2 +-
 sw/source/filter/xml/xmlbrsh.cxx |2 +-
 sw/source/filter/xml/xmltbli.cxx |4 ++--
 sw/source/uibase/app/applab.cxx  |2 +-
 sw/source/uibase/app/swmodul1.cxx|2 +-
 sw/source/uibase/dbui/dbmgr.cxx  |2 +-
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx |2 +-
 sw/source/uibase/dochdl/swdtflvr.cxx |6 +++---
 sw/source/uibase/docvw/PostItMgr.cxx |2 +-
 sw/source/uibase/docvw/edtwin.cxx|2 +-
 sw/source/uibase/fldui/fldmgr.cxx|2 +-
 15 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit a936097614b5aaa51e123323da8f275575e165f8
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:12:08 2015 +0200

Fix typos

Change-Id: I2373a842818a5ac6ce5bd75205580f7cdc0212e4
Reviewed-on: https://gerrit.libreoffice.org/18988
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e5645d0..ef9dd9b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1937,7 +1937,7 @@ void SwWW8ImplReader::ImportDop()
 
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_FORMER_OBJECT_POS,
 false);
 
 // #i27767# - set new compatibility option
-//  'Conder Wrapping mode when positioning object' to 
+//  'Consider Wrapping mode when positioning object' to 
 
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION,
 true);
 
 
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_FORMER_TEXT_WRAPPING,
 false); // #i13832#, #i24135#
@@ -3215,7 +3215,7 @@ namespace
 // hack the word one onto the range we use. However it's unclear what word's
 // categorization is. So we don't do that here yet.
 
-// Additional to the categorization, when word encounters weak text for 
ambiguos
+// Additional to the categorization, when word encounters weak text for 
ambiguous
 // chars it uses idcthint to indicate which way to bias. We don't have a 
idcthint
 // feature in writer.
 
@@ -3229,7 +3229,7 @@ namespace
 // See https://bugs.libreoffice.org/show_bug.cgi?id=34319 for an example
 //
 // TO-DO: revisit this after the fix of #i119612# which retains the
-// idcthint feature on import from word and has it available for reexport
+// idcthint feature on import from word and has it available for re-export
 // but we don't use it yet for the actual rendering and layout
 void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& 
rAddString)
 {
@@ -4928,7 +4928,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
 
 /*
 RefFieldStck: Keeps track of bookmarks which may be inserted as
-variables intstead.
+variables instead.
 */
 m_pReffedStck = new SwWW8ReferencedFltEndStack(&m_rDoc, m_nFieldFlags);
 m_pReffingStck = new SwWW8FltRefStack(&m_rDoc, m_nFieldFlags);
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 0b570d5..865cbc4 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1055,7 +1055,7 @@ void SwWW8ImplReader::InsertTagField( const sal_uInt16 
nId, const OUString& rTag
 SwInsertFlags::NOHINTEXPAND);
 }
 else
-{   // normal tagggen
+{   // normal taggen
 
 SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFieldType(
 SwSetExpFieldType( &m_rDoc, aName, 
nsSwGetSetExpType::GSE_STRING ) );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3cea85a..4f82a46 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4488,10 +4488,10 @@ void SwWW8ImplReader::Read_TextAnim(sal_uInt16 /*nId*/, 
const sal_uInt8* pData,
 bool bBlink;
 
 // The 7 animated text effects available in word all get
-// mapped to a blinking text effect in StarOffice
+// mapped to a blinking text effect in LibreOffice
 // 0 no animation   1 Las Vegas lights
 // 2 background blink   3 sparkle text
-// 4 marching ants  5 marchine red ants
+// 4 marching ants  5 marching red ants
 // 6 shimmer
 if (*pData > 0 && *pData < 7 )
 bBlink = true;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8s

[Libreoffice-commits] core.git: sw/source testtools/source toolkit/qa toolkit/source tools/source

[Andrea Gelmini]

 sw/source/ui/fldui/fldref.cxx |2 +-
 sw/source/ui/frmdlg/column.cxx|4 ++--
 sw/source/ui/misc/glossary.cxx|2 +-
 sw/source/ui/vba/vbasections.cxx  |2 +-
 sw/source/uibase/inc/wrtsh.hxx|2 +-
 sw/source/uibase/shells/langhelper.cxx|2 +-
 sw/source/uibase/uiview/viewport.cxx  |2 +-
 sw/source/uibase/utlui/content.cxx|2 +-
 sw/source/uibase/wrtsh/select.cxx |2 +-
 sw/source/uibase/wrtsh/wrtsh2.cxx |2 +-
 testtools/source/bridgetest/pyuno/core.py |2 +-
 toolkit/qa/complex/toolkit/GridControl.java   |2 +-
 toolkit/source/controls/controlmodelcontainerbase.cxx |2 +-
 toolkit/source/controls/unocontrols.cxx   |2 +-
 tools/source/generic/b3dtrans.cxx |2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit a2a5187a8ff7b8a18db51a471bd934e5a94c155c
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:12:15 2015 +0200

Fix typos

Change-Id: Ifddd2533b767924791338555031b848c59980c52
Reviewed-on: https://gerrit.libreoffice.org/18989
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index d32b11a..252cf9b 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -912,7 +912,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
 }
 else// SeqenceFields
 {
-// get fields for Seq-FeldType:
+// get fields for Seq-FieldType:
 SwSetExpFieldType* pType = 
static_cast(pSh->GetFieldType(
 nTypeId & ~REFFLDFLAG, RES_SETEXPFLD ));
 if( pType )
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index c6d2f35..8a62944 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -347,7 +347,7 @@ IMPL_LINK_NOARG_TYPED(SwColumnDlg, OkHdl, Button*, void)
 
 if(pPageSet && SfxItemState::SET == pPageSet->GetItemState(RES_COL) && 
bPageChanged)
 {
-// deterine current PageDescriptor and fill the Set with it
+// determine current PageDescriptor and fill the Set with it
 const size_t nCurIdx = rWrtShell.GetCurPageDesc();
 SwPageDesc aPageDesc(rWrtShell.GetPageDesc(nCurIdx));
 SwFrameFormat &rFormat = aPageDesc.GetMaster();
@@ -1074,7 +1074,7 @@ IMPL_LINK( SwColumnPage, EdModify, MetricField *, 
pMetricField )
 }
 
 // Handler behind the Checkbox for automatic width. When the box is checked
-// no expicit values for the column width can be entered.
+// no explicit values for the column width can be entered.
 IMPL_LINK_TYPED( SwColumnPage, AutoWidthHdl, Button*, pButton, void )
 {
 CheckBox* pBox = static_cast(pButton);
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 4d9e78b..77586e8 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -763,7 +763,7 @@ void SwGlossaryDlg::Init()
 m_pCategoryBox->MakeVisible(pSelEntry);
 GrpSelect(m_pCategoryBox);
 }
-//JP 16.11.99: the SvxTreeListBox has a Bug. The Box dont recalc the
+//JP 16.11.99: the SvxTreeListBox has a Bug. The Box don't recalc the
 //  outputsize, when all entries are insertet. The result is, that
 //  the Focus/Highlight rectangle is to large and paintet over the
 //  HScrollbar. -> Fix: call the resize
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index a23d56d..843029c 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -81,7 +81,7 @@ public:
 
 SectionCollectionHelper( const uno::Reference< XHelperInterface >& 
xParent, const uno::Reference< uno::XComponentContext >& xContext, const 
uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange 
>& xTextRange ) throw (uno::RuntimeException) : mxParent( xParent ), mxContext( 
xContext ), mxModel( xModel )
 {
-// Hacky implementation of Range.Sections, only support 1 secction
+// Hacky implementation of Range.Sections, only support 1 section
 uno::Reference< beans::XPropertySet > xRangeProps( xTextRange, 
uno::UNO_QUERY_THROW );
 uno::Reference< style::XStyle > xStyle = word::getCurrentPageStyle( 
mxModel, xRangeProps );
 uno::Reference< beans::XPropertySet > xPageProps( xStyle, 
uno::UNO_QUERY_THROW );
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 01db507..904da2b 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -175,7 +175,7 @@ public:
 boolIsSttOfPara() const { return IsSttPara(); }
 boolIsEndOfPara() 

[Libreoffice-commits] core.git: xmlsecurity/source

[Andrea Gelmini]

 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0dd7f887bb59b58e22a27a2110cdf1f1833042a
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:13:58 2015 +0200

Fix typos

Change-Id: I7dbee92d75836c54fd245c89a70ab02e40dafefb
Reviewed-on: https://gerrit.libreoffice.org/18998
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 2259c1d..f2f5a0a 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::security ;
 using ::com::sun::star::security::XCertificate ;
 using ::com::sun::star::util::DateTime ;
 
-/*Resturns the index within rRawString where sTypeName starts and where it 
ends.
+/*Returns the index within rRawString where sTypeName starts and where it ends.
 The starting index is pair.first. The ending index in pair.second points
 one char after the last character of the type.
 sTypeName can be
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/unx vcl/win winaccessibility/inc winaccessibility/source wizards/com writerfilter/source

[Andrea Gelmini]

 vcl/unx/gtk/a11y/atktextattributes.cxx |2 +-
 vcl/unx/gtk/app/gtkdata.cxx|2 +-
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx   |4 ++--
 vcl/unx/kde/UnxFilePicker.cxx  |2 +-
 vcl/win/source/gdi/gdiimpl.cxx |2 +-
 vcl/win/source/gdi/salprn.cxx  |2 +-
 vcl/win/source/gdi/winlayout.cxx   |2 +-
 winaccessibility/inc/AccObjectManagerAgent.hxx |2 +-
 winaccessibility/source/UAccCOM/AccTable.cxx   |2 +-
 wizards/com/sun/star/wizards/db/ColumnPropertySet.java |2 +-
 wizards/com/sun/star/wizards/db/TypeInspector.java |2 +-
 wizards/com/sun/star/wizards/text/TextDocument.java|4 ++--
 wizards/com/sun/star/wizards/web/BackgroundsDialog.py  |2 +-
 wizards/com/sun/star/wizards/web/Process.py|2 +-
 writerfilter/source/dmapper/ConversionHelper.cxx   |2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 3406ae78a5bcd02551ce518ca1affba021dbab04
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:13:35 2015 +0200

Fix typos

Change-Id: I4525b43fa823d743b86bf4136c56af35274085e6
Reviewed-on: https://gerrit.libreoffice.org/18995
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx 
b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 7342005..cff769c 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -565,7 +565,7 @@ CMM2UnitString(const uno::Any& rAny)
 static bool
 UnitString2CMM( uno::Any& rAny, const gchar * value )
 {
-float fValue = 0.0; // pb: dont use double here because of warning on linux
+float fValue = 0.0; // pb: don't use double here because of warning on 
linux
 
 if( 1 != sscanf( value, "%gmm", &fValue ) )
 return false;
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 1a406c3..d6f7158 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -579,7 +579,7 @@ void GtkData::Yield( bool bWait, bool 
bHandleAllCurrentEvents )
 blockIdleTimeout = !bWait;
 /* #i33212# only enter g_main_context_iteration in one thread at any one
  * time, else one of them potentially will never end as long as there is
- * another thread in there. Having only one yieldin thread actually 
dispatch
+ * another thread in there. Having only one yielding thread actually 
dispatch
  * fits the vcl event model (see e.g. the generic plugin).
  */
 bool bDispatchThread = false;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 4efce45..ac9f8d1 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -925,7 +925,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( 
uno::RuntimeException, std
 uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
 while( GTK_RESPONSE_NO == btn )
 {
-btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks 
NO for file save.
+btn = GTK_RESPONSE_YES; // we don't want to repeat unless user clicks 
NO for file save.
 
 gint nStatus = pRunDialog->run();
 switch( nStatus )
@@ -1794,7 +1794,7 @@ case_insensitive_filter (const GtkFileFilterInfo 
*filter_info, gpointer data)
 if( !g_ascii_strcasecmp( pFilter, pExtn ) )
 bRetval = true;
 
-SAL_INFO( "vcl.gtk", "'" << filter_info->uri << "' match extn '" << pExtn 
<< "' vs '" << pFilter << "' yeilds " << bRetval );
+SAL_INFO( "vcl.gtk", "'" << filter_info->uri << "' match extn '" << pExtn 
<< "' vs '" << pFilter << "' yields " << bRetval );
 
 return bRetval;
 }
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index a3bf19c..60b1b46 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -860,7 +860,7 @@ void UnxFilePicker::checkFilePicker() throw( 
::com::sun::star::uno::RuntimeExcep
 {
 if ( m_nFilePickerPid > 0 )
 {
-// TODO check if external file picker is runnning
+// TODO check if external file picker is running
 }
 else
 {
diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx
index ec55573..07d8f4e 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/source/gdi/gdiimpl.cxx
@@ -1606,7 +1606,7 @@ void WinSalGraphicsImpl::drawPolyLine( sal_uInt32 
nPoints, const SalPoint* pPtAr
 
 POINT* pWinPtAry = (POINT*)pPtAry;
 
-// we assume there are at least 2 points (Polyline requres at least 2 
point, see MSDN)
+// we assume there are at least 2 points (Polyline requires at least 2 
point, see MSDN)
 // we must paint the endpoint for last line
 BOOL bPaintEnd = TRUE;
 if ( pWinPtAry[nPoints-2].x == pWinPtAry[nPoints-1].x )
diff --git a/vcl/win/source/gdi/salprn.cx

[Libreoffice-commits] core.git: xmloff/source xmlscript/source xmlsecurity/source

[Andrea Gelmini]

 xmloff/source/text/XMLAutoTextContainerEventImport.hxx|2 +-
 xmloff/source/text/XMLPropertyBackpatcher.hxx |2 +-
 xmloff/source/text/XMLRedlineExport.cxx   |2 +-
 xmloff/source/text/txtprmap.cxx   |2 +-
 xmloff/source/transform/EventOASISTContext.cxx|2 +-
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx|2 +-
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx   |4 
++--
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx|6 
+++---
 xmlsecurity/source/dialogs/resourcemanager.cxx|2 +-
 xmlsecurity/source/framework/buffernode.cxx   |2 +-
 xmlsecurity/source/framework/saxeventkeeperimpl.cxx   |2 +-
 xmlsecurity/source/framework/saxeventkeeperimpl.hxx   |2 +-
 xmlsecurity/source/framework/securityengine.hxx   |2 +-
 xmlsecurity/source/helper/xsecctl.hxx |2 +-
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 4678982056a11f978277a2da7a085e4f6ac24afd
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:13:49 2015 +0200

Fix typos

Change-Id: I2cdfc4e9d8ba1acb7c2548f9394d320c6504207e
Reviewed-on: https://gerrit.libreoffice.org/18997
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx 
b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
index 8f4e66c..b249acc 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star {
 
 /**
  * Import the text:auto-text-container element.
- * This only instantiates text:auto-text-group contexta.
+ * This only instantiates text:auto-text-group context.
  */
 class XMLAutoTextContainerEventImport : public SvXMLImportContext
 {
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx 
b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index b1bcb00..9396ade 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
  * yet known.
  *
  * A good example for appropriate use are footnotes and references to
- * footnoes. Internally, the StarOffice API numbers footnotes, and
+ * footnotes. Internally, the LibreOffice API numbers footnotes, and
  * references to footnotes refer to that internal numbering. In the
  * XML file format, these numbers are replaced with name strings. Now
  * if during import of a document a reference to a footnote is
diff --git a/xmloff/source/text/XMLRedlineExport.cxx 
b/xmloff/source/text/XMLRedlineExport.cxx
index 56ae192..cd4330f 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -593,7 +593,7 @@ void XMLRedlineExport::ExportStartOrEndRedline(
 {
 DBG_ASSERT( !sId.isEmpty(), "Redlines must have IDs" );
 
-// TODO: use GetRedlineID or elimiate that function
+// TODO: use GetRedlineID or eliminate that function
 OUStringBuffer sBuffer(sChangePrefix);
 sBuffer.append(sId);
 
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 12d7a29..bcaf317 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -806,7 +806,7 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
 // RES_KEEP
 // not required
 // RES_URL
-// not required (exprted as draw:a element)
+// not required (exported as draw:a element)
 // RES_EDIT_IN_READONLY
 MG_ED( "EditInReadonly",STYLE,  EDITABLE,   
XML_TYPE_BOOL, 0 ),
 // RES_LAYOUT_SPLIT
diff --git a/xmloff/source/transform/EventOASISTContext.cxx 
b/xmloff/source/transform/EventOASISTContext.cxx
index 8250d14..78117a7 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -241,7 +241,7 @@ void XMLEventOASISTransformerContext::StartElement(
 case XML_ATACTION_EVENT_NAME:
 {
 // Check if the event belongs to a form or control by
-// cehcking the 2nd ancestor element, f.i.:
+// checking the 2nd ancestor element, f.i.:
 // 
 const XMLTransformerContext *pObjContext =
 GetTransformer().GetAncestorContext( 1 );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 10d03ce..8f24797 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscr

[Libreoffice-commits] core.git: writerfilter/source xmerge/source xmlhelp/source xmloff/source

[Andrea Gelmini]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx  
|2 +-
 writerfilter/source/dmapper/FieldTypes.hxx 
|4 ++--
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx  
|2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx 
|2 +-
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java 
|2 +-
 xmlhelp/source/cxxhelp/provider/provider.hxx   
|2 +-
 xmloff/source/chart/SchXMLChartContext.cxx 
|2 +-
 xmloff/source/chart/SchXMLTableContext.cxx 
|2 +-
 xmloff/source/draw/animationimport.cxx 
|2 +-
 xmloff/source/draw/shapeimport.cxx 
|2 +-
 xmloff/source/forms/elementimport.cxx  
|2 +-
 xmloff/source/forms/formcellbinding.hxx
|2 +-
 xmloff/source/style/FillStyleContext.hxx   
|2 +-
 xmloff/source/style/prstylei.cxx   
|2 +-
 xmloff/source/style/xmlexppr.cxx   
|2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 79797f8e594650ca422a4236d033205f654c035c
Author: Andrea Gelmini 
Date:   Tue Sep 29 18:13:41 2015 +0200

Fix typos

Change-Id: If2e4adb2ce93c02ee14d831eedf4ef31da04b92d
Reviewed-on: https://gerrit.libreoffice.org/18996
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2a8621a..d6b1334c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -900,7 +900,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
 rAppendContext.pLastParagraphProperties->GetWrap() :
 pStyleProperties->GetWrap() >= 0 ? 
pStyleProperties->GetWrap() : 0 )));
 
-/** FDO#73546 : distL & distR should be unsigned intgers 
+/** FDO#73546 : distL & distR should be unsigned integers 

 Swapped the array elements 11,12 & 13,14 since 11 & 12 are
 LEFT & RIGHT margins and 13,14 are TOP and BOTTOM margins 
respectively.
 */
diff --git a/writerfilter/source/dmapper/FieldTypes.hxx 
b/writerfilter/source/dmapper/FieldTypes.hxx
index 7fb9515..06bd44f 100644
--- a/writerfilter/source/dmapper/FieldTypes.hxx
+++ b/writerfilter/source/dmapper/FieldTypes.hxx
@@ -166,13 +166,13 @@ enum FieldId
 ,FIELD_PAGEREF
 /* REF targetbkm \f \* MERGEFORMAT ->
 imports a ShowVariable (bookmarkname)?
-\h hyerlink to paragraph
+\h hyperlink to paragraph
 \p relative to para above/below
 \f refenence number
 \d separator number separator
 \n paragraph number
 \r paragraph number in relative context
-\t suppres non delimiters
+\t suppress non delimiters
 \w paragraph number in full context
 \* Upper/Lower...
  */
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 4fa867b..2125b81 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1823,7 +1823,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
 
 // We have methods to _add_ individual tokens or whole namespaces to be
 // processed by writerfilter (instead of oox), but we have no method to
-// filter out a single token. Just hardwire the wrap token here till we
+// filter out a single token. Just hardwire the wrap token here untill we
 // need a more generic solution.
 bool bIsWrap = Element == static_cast(NMSP_vmlWord | XML_wrap);
 bool bSkipImages = getDocument()->IsSkipImages() && 
oox::getNamespace(Element) == static_cast(NMSP_dml) &&
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b030d3d..1dd8197 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2374,7 +2374,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword 
nKeyword)
 if (m_bNeedPar)
 dispatchSymbol(RTF_PAR);
 m_bIgnoreNextContSectBreak = true;
-// arrange to clean up the syntetic RTF_SBKPAGE
+// arrange to clean up the synthetic RTF_SBKPAGE
 m_nResetBreakOnSectBreak = RTF_SBKNONE;
 }
 else
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOM

aybuke lisance statement

[aybüke özdemir]

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.



-- 
Aybüke Özdemir
https://about.me/aybukeozdemir
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 1020 commits - accessibility/inc accessibility/source android/Bootstrap android/source apple_remote/Library_AppleRemote.mk apple_remo

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit ee5c9ba27e38b8b9119e8ebb230e9bcb38497efe
Author: Douglas Mencken 
Date:   Tue Sep 29 17:29:45 2015 -0400

if "need these flags in case of OS X sandboxing" then check for 
ENABLE_MACOSX_SANDBOX

see commit 57117cf52d4c91029cbabf852d1f82c386ac1d75

Change-Id: Ibabc57d1ca683c28f1d258f92019c4d25fc71157

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index df5cfb4..c90c86b 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -64,21 +64,24 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 
 ifeq ($(OS),MACOSX)
 
-$(eval $(call gb_Library_add_cxxflags,sofficeapp,\
-$(gb_OBJCXXFLAGS) \
-))
-
 $(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\
 Foundation \
 ))
 
 endif
 
+ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_cxxflags,sofficeapp,\
+$(gb_OBJCXXFLAGS) \
+))
+endif
 ifeq ($(OS),IOS)
 $(eval $(call gb_Library_add_cflags,sofficeapp,\
 $(gb_OBJCFLAGS) \
 ))
 endif
+endif
 
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 desktop/source/app/app \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index ca9e5c5..ea0de70 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -91,9 +91,11 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 
 ifeq ($(OS),MACOSX)
 
+ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE)
 $(eval $(call gb_Library_add_cxxflags,svxcore,\
 $(gb_OBJCXXFLAGS) \
 ))
+endif
 
 $(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\
Foundation \
commit a5ac594de313d736c01cc01c165bd3e8fe1327ce
Author: Douglas Mencken 
Date:   Wed Sep 9 18:00:51 2015 -0400

avoid using new literal syntax for NSDictionary

Collection literals were introduced only with LLVM 4.0 (OS X 10.8)

// a dictionary literal
NSDictionary *di = @{ @1: @"hello", @2: @"world" };
// old style
NSDictionary *di = [ NSDictionary dictionaryWithObjectsAndKeys: @"hello", 
@1, @"world", @2, nil ];

Related commits:
1276bf033b11a71961cd3454bb44bf08f997ca62
6c2f65dfe08dd7acefec3be00b4f38dd5bca50a8

Change-Id: Ie5f3eae917e8e3e14ccdea7b69adae34ab09d0ea

diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index f8d8c63..601e16b 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -43,7 +43,7 @@ bool ImageToPNG( com::sun::star::uno::Sequence& 
rImgData,
 if( !pRep)
 return false;
 
-NSData* pOut = [pRep representationUsingType: NSPNGFileType properties: @{ 
}];
+NSData* pOut = [pRep representationUsingType: NSPNGFileType properties: [ 
NSDictionary dictionary ]];
 if( !pOut)
 return false;
 
@@ -66,7 +66,7 @@ bool PNGToImage( com::sun::star::uno::Sequence& 
rPngData,
 if( !pRep)
 return false;
 
-NSData* pOut = [pRep representationUsingType: eOutFormat properties: @{ }];
+NSData* pOut = [pRep representationUsingType: eOutFormat properties: [ 
NSDictionary dictionary ]];
 if( !pOut)
 return false;
 
diff --git a/vcl/osx/a11ytextwrapper.mm b/vcl/osx/a11ytextwrapper.mm
index bfa67d1..2905a33 100644
--- a/vcl/osx/a11ytextwrapper.mm
+++ b/vcl/osx/a11ytextwrapper.mm
@@ -270,7 +270,7 @@ using namespace ::com::sun::star::uno;
 NSAttributedString * attrString = (NSAttributedString *) [ 
AquaA11yTextWrapper attributedStringForRangeAttributeForElement: wrapper 
forParameter: range ];
 if ( attrString != nil ) {
 @try {
-rtfData = [ attrString RTFFromRange: [ range rangeValue ] 
documentAttributes: @{NSDocumentTypeDocumentAttribute : NSRTFTextDocumentType} 
];
+rtfData = [ attrString RTFFromRange: [ range rangeValue ] 
documentAttributes: [ NSDictionary dictionaryWithObjectsAndKeys: 
NSRTFTextDocumentType, NSDocumentTypeDocumentAttribute, nil ] ];
 } @catch ( NSException * e) {
 // emtpy
 }
commit f59d14ffc90f3e70615565b683007b02e843164d
Author: Douglas Mencken 
Date:   Wed Sep 9 18:23:23 2015 -0400

static_cast isn't sufficient as (SEL)nil replacement

see also commits:
0d0729ca97e67505a52dcb07d7819f6c444a0031
f6ec07a3963a401dc736baa9bdd2ed3c7325bb66

Change-Id: If44f2537a35b4dfd0013a59cd7ea9c6c86542f11

diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index a90f917..40a79a7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -149,7 +149,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject 
*obj) {
 // (getter with parameter)attributeNameHereAttributeForParameter:
 // (setter)   setAttributeNameHereAttributeForElement:to:
 -(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter 
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = static_cast(nil);
+SEL selector = reinterpret_cast(nil);
 NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 38/9cc5a97f0d3fbf88fa15b92e849d821131ba6c 89/9f3a1c6c24f71efabfbcaa0238308037cf830b

[Caolán McNamara]

 38/9cc5a97f0d3fbf88fa15b92e849d821131ba6c |1 +
 89/9f3a1c6c24f71efabfbcaa0238308037cf830b |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 3c670ccae355d8da93d455e538bb2049124f729b
Author: Caolán McNamara 
Date:   Tue Sep 29 21:12:39 2015 +0100

Notes added by 'git notes add'

diff --git a/38/9cc5a97f0d3fbf88fa15b92e849d821131ba6c 
b/38/9cc5a97f0d3fbf88fa15b92e849d821131ba6c
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/38/9cc5a97f0d3fbf88fa15b92e849d821131ba6c
@@ -0,0 +1 @@
+ignore: aoo
commit e710b0ddf62198d1cea1dff02ec0516ae4cd4df2
Author: Caolán McNamara 
Date:   Tue Sep 29 21:12:24 2015 +0100

Notes added by 'git notes add'

diff --git a/89/9f3a1c6c24f71efabfbcaa0238308037cf830b 
b/89/9f3a1c6c24f71efabfbcaa0238308037cf830b
new file mode 100644
index 000..bad58a9
--- /dev/null
+++ b/89/9f3a1c6c24f71efabfbcaa0238308037cf830b
@@ -0,0 +1 @@
+prefer: 077bdc73f2bcd625be1030fa8ff630c3dbd83657
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/text/frmform.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit e0e2cc7ca6d498b3e696bbc306d3f1e403ebf27d
Author: Caolán McNamara 
Date:   Tue Sep 29 21:05:58 2015 +0100

Related: tdf#93461 relax loop detection some more

have an internal RH document which has a caption on a draw
document which appears behind the drawing otherwise

Change-Id: I7c3abb3104e0125fce4fc1b575861006f166fa48

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index b9a0377..7d3c623 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1895,18 +1895,21 @@ bool SwTextFrm::FormatQuick( bool bForceQuickFormat )
 const sal_Int32 nEnd = GetFollow()
   ? GetFollow()->GetOfst() : aInf.GetText().getLength();
 
-bool bPreviousLayoutWasZeroWidth = false;
+int nLoopProtection = 0;
 do
 {
 sal_Int32 nNewStart = aLine.FormatLine(nStart);
-bool bThisLayoutIsZeroWidth = (nNewStart == nStart);
+if (nNewStart == nStart)
+++nLoopProtection;
+else
+nLoopProtection = 0;
 nStart = nNewStart;
-bool bWillEndlessInsert = (bPreviousLayoutWasZeroWidth && 
bThisLayoutIsZeroWidth);
+const bool bWillEndlessInsert = nLoopProtection > 2;
+SAL_WARN_IF(bWillEndlessInsert, "sw", "loop detection triggered");
 if ((!bWillEndlessInsert) // Check for special case: line is invisible,
   // like in too thin table cell: tdf#66141
  && (aInf.IsNewLine() || (!aInf.IsStop() && nStart < nEnd)))
 aLine.Insert( new SwLineLayout() );
-bPreviousLayoutWasZeroWidth = bThisLayoutIsZeroWidth;
 } while( aLine.Next() );
 
 // Last exit: the heights need to match
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 2 commits - clang/find-unprefixed-members.cxx clang/test.hxx

[Miklos Vajna]

 clang/find-unprefixed-members.cxx |   62 +++---
 clang/test.hxx|5 +++
 2 files changed, 57 insertions(+), 10 deletions(-)

New commits:
commit 49464ca6ecfcd7398ded778f047e002b5fa4cc60
Author: Miklos Vajna 
Date:   Tue Sep 29 21:29:09 2015 +0200

clang: ignore structs without ctor/dtor/member funs in 
find-unprefixed-members

diff --git a/clang/find-unprefixed-members.cxx 
b/clang/find-unprefixed-members.cxx
index 52b1529..1d5c67f 100644
--- a/clang/find-unprefixed-members.cxx
+++ b/clang/find-unprefixed-members.cxx
@@ -34,18 +34,23 @@ public:
 class Visitor : public clang::RecursiveASTVisitor
 {
 const Context m_rContext;
-bool m_bFound;
+std::vector m_aResults;
+std::set m_aFunctions;
 
 public:
 Visitor(const Context& rContext)
-: m_rContext(rContext),
-  m_bFound(false)
+: m_rContext(rContext)
 {
 }
 
-bool getFound()
+const std::vector& getResults()
 {
-return m_bFound;
+return m_aResults;
+}
+
+const std::set& getFunctions()
+{
+return m_aFunctions;
 }
 
 /*
@@ -65,8 +70,9 @@ public:
 if (aName.find("m") != 0)
 {
 aName.insert(0, "m_");
-std::cout << pRecord->getQualifiedNameAsString() << "::" << 
pDecl->getNameAsString() << "," << aName << std::endl;
-m_bFound = true;
+std::stringstream ss;
+ss << pRecord->getQualifiedNameAsString() << "::" << 
pDecl->getNameAsString() << "," << aName;
+m_aResults.push_back(ss.str());
 }
 }
 
@@ -93,13 +99,35 @@ public:
 if (aName.find("m") != 0)
 {
 aName.insert(0, "m_");
-std::cout << pRecord->getQualifiedNameAsString() << "::" << 
pDecl->getNameAsString() << "," << aName << std::endl;
-m_bFound = true;
+std::stringstream ss;
+ss << pRecord->getQualifiedNameAsString() << "::" << 
pDecl->getNameAsString() << "," << aName;
+m_aResults.push_back(ss.str());
 }
 }
 
 return true;
 }
+
+bool VisitCXXConstructorDecl(clang::CXXConstructorDecl* pDecl)
+{
+clang::CXXRecordDecl* pRecord = pDecl->getParent();
+m_aFunctions.insert(pRecord->getQualifiedNameAsString());
+return true;
+}
+
+bool VisitCXXDestructorDecl(clang::CXXDestructorDecl* pDecl)
+{
+clang::CXXRecordDecl* pRecord = pDecl->getParent();
+m_aFunctions.insert(pRecord->getQualifiedNameAsString());
+return true;
+}
+
+bool VisitCXXMethodDecl(clang::CXXMethodDecl* pDecl)
+{
+clang::CXXRecordDecl* pRecord = pDecl->getParent();
+m_aFunctions.insert(pRecord->getQualifiedNameAsString());
+return true;
+}
 };
 
 class ASTConsumer : public clang::ASTConsumer
@@ -119,7 +147,21 @@ public:
 
 Visitor aVisitor(m_rContext);
 aVisitor.TraverseDecl(rContext.getTranslationUnitDecl());
-if (aVisitor.getFound())
+const std::set& rFunctions = aVisitor.getFunctions();
+const std::vector& rResults = aVisitor.getResults();
+bool bFound = false;
+for (const std::string& rFunction : rFunctions)
+{
+for (const std::string& rResult : rResults)
+{
+if (rResult.find(rFunction) == 0)
+{
+std::cerr << rResult << std::endl;
+bFound = true;
+}
+}
+}
+if (bFound)
 exit(1);
 }
 };
commit 8d53076838749c5d1de75b50955c54275e84f091
Author: Miklos Vajna 
Date:   Tue Sep 29 21:28:04 2015 +0200

clang: add struct test that is currently mishandled by 
find-unprefixed-members

diff --git a/clang/test.hxx b/clang/test.hxx
index 6b3d9c4..78ae7c2 100644
--- a/clang/test.hxx
+++ b/clang/test.hxx
@@ -25,6 +25,11 @@ public:
 
 C() { }
 };
+/// This has no ctor/dtor/member functions, so members are OK to be not 
prefixed.
+struct S
+{
+int nX, mnY, m_nZ;
+};
 }
 
 #define DELETEZ( p )( delete p,p = 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nutil/source

[Andrea Gelmini]

 i18nutil/source/utility/paper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81e2dbd9b5615d57c1737aeff3f083d48a71405b
Author: Andrea Gelmini 
Date:   Tue Sep 22 18:22:47 2015 +0200

Updated URL

Change-Id: I20656a78d25bcb767340057c259e9b2d83ec152a
Reviewed-on: https://gerrit.libreoffice.org/18933
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18nutil/source/utility/paper.cxx 
b/i18nutil/source/utility/paper.cxx
index c61bac6..846da75 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -60,7 +60,7 @@ struct PageDesc
 
 //PostScript Printer Description File Format Specification
 //http://partners.adobe.com/public/developer/en/ps/5003.PPD_Spec_v4.3.pdf
-//http://www.y-adagio.com/public/committees/docsii/doc_00-49/symp_ulaan/china_ppr.pdf
 (Kai)
+//https://web.archive.org/web/20040912070512/http://www.y-adagio.com/public/committees/docsii/doc_00-49/symp_ulaan/china_ppr.pdf
 (Kai)
 
//http://www.sls.psi.ch/controls/help/howto/Howto_Print_a_A0_Poster_at_WSLA_012_2.pdf
 (Dia)
 static const PageDesc aDinTab[] =
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source basic/source chart2/source comphelper/source connectivity/source cui/source dbaccess/source editeng/source extensions/source filter/source forms/source fo

[Stefan Heinemann]

 basctl/source/basicide/basicbox.cxx |   16 -
 basctl/source/basicide/basides1.cxx |6 
 basctl/source/basicide/bastypes.cxx |6 
 basctl/source/basicide/moduldl2.cxx |6 
 basic/source/runtime/methods.cxx|   12 
 chart2/source/controller/main/ElementSelector.cxx   |6 
 comphelper/source/misc/types.cxx|6 
 connectivity/source/commontools/TSortIndex.cxx  |   12 
 cui/source/customize/macropg.cxx|4 
 cui/source/dialogs/hangulhanjadlg.cxx   |   16 -
 cui/source/inc/numfmt.hxx   |2 
 cui/source/tabpages/autocdlg.cxx|   10 
 cui/source/tabpages/numfmt.cxx  |6 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx  |4 
 dbaccess/source/ui/browser/brwview.cxx  |6 
 dbaccess/source/ui/misc/WTypeSelect.cxx |8 
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx   |8 
 dbaccess/source/ui/relationdesign/RelationDesignView.cxx|   10 
 editeng/source/items/paraitem.cxx   |   12 
 extensions/source/bibliography/bibcont.cxx  |8 
 extensions/source/bibliography/toolbar.cxx  |8 
 extensions/source/propctrlr/standardcontrol.cxx |   16 -
 filter/source/graphicfilter/ipcx/ipcx.cxx   |6 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx|   10 
 forms/source/richtext/richtextvclcontrol.cxx|6 
 forms/source/xforms/computedexpression.cxx  |4 
 formula/source/ui/dlg/formula.cxx   |8 
 formula/source/ui/dlg/funcpage.cxx  |4 
 formula/source/ui/dlg/funcutl.cxx   |   12 
 fpicker/source/office/iodlg.cxx |   10 
 framework/source/uielement/comboboxtoolbarcontroller.cxx|   10 
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx |   10 
 framework/source/uielement/edittoolbarcontroller.cxx|   10 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx   |   10 
 include/svl/poolitem.hxx|8 
 include/svx/ctredlin.hxx|   12 
 include/vbahelper/vbareturntypes.hxx|2 
 oox/source/ppt/slidetransition.cxx  |6 
 reportdesign/source/ui/report/DesignView.cxx|   10 
 rsc/inc/rscclass.hxx|2 
 rsc/inc/rsctop.hxx  |2 
 sc/inc/chgviset.hxx |   12 
 sc/source/core/tool/chgviset.cxx|6 
 sc/source/core/tool/interpr1.cxx|  174 +--
 sc/source/filter/excel/xecontent.cxx|   16 -
 sc/source/ui/docshell/docsh.cxx |6 
 sc/source/ui/navipi/navipi.cxx  |   12 
 sc/source/ui/view/gridwin.cxx   |8 
 sc/source/ui/view/tabvwsh4.cxx  |6 
 sd/source/ui/animations/CustomAnimationDialog.cxx   |8 
 sd/source/ui/dlg/navigatr.cxx   |6 
 sd/source/ui/view/ViewShellBase.cxx |8 
 sd/source/ui/view/sdwindow.cxx  |   10 
 sd/source/ui/view/viewshel.cxx  |   12 
 sfx2/source/appl/app.cxx|6 
 sfx2/source/appl/appdde.cxx |4 
 sfx2/source/appl/newhelp.cxx|   32 +-
 sfx2/source/control/thumbnailviewitem.cxx   |6 
 sfx2/source/dialog/templdlg.cxx |   22 -
 sfx2/source/doc/objxtor.cxx |6 
 sfx2/source/sidebar/Theme.cxx   |6 
 sfx2/source/view/frame.cxx  |   18 -
 slideshow/source/engine/slideshowimpl.cxx   |   22 -
 slideshow/source/engine/tools.cxx   |6 
 svtools/source/contnr/simptabl.cxx  |8 
 svtools/source/control/ctrlbox.cxx  |4 
 svtools/source/control/fileurlbox.cxx   |4 
 svtools/source/control/tabbar.cxx   |4 
 svtools/source/control/urlcontrol.cxx   |4 
 svtools/source/dialogs/roadmapwizard.cxx|4 
 svtools/source/table/tabledatawindow.cxx|6 
 svx/source/dialog/ctredlin.cxx  |   34 +-
 svx/sour

[Libreoffice-commits] core.git: i18npool/source

[Andrea Gelmini]

 i18npool/source/calendar/calendar_jewish.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 491c2e24ac110c9ebdb1a483c34ae3d14ab0d615
Author: Andrea Gelmini 
Date:   Mon Sep 21 13:29:02 2015 +0200

Jewish Calendar: updated URL of borrowed code

Change-Id: Id937e0b1192ad0bf4ba4ecc38e69c55d024fe3c0
Reviewed-on: https://gerrit.libreoffice.org/18930
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18npool/source/calendar/calendar_jewish.cxx 
b/i18npool/source/calendar/calendar_jewish.cxx
index 1e399eb..3073c37 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -43,7 +43,7 @@ Calendar_jewish::Calendar_jewish()
 
 // This code is in the public domain, but any use of it
 // should acknowledge its source.
-// http://www.ntu.edu.sg/home/ayxyan/date1.txt
+// 
https://web.archive.org/web/20010222054702/http://www.ntu.edu.sg/home/ayxyan/date1.txt
 
 // Hebrew dates
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes10' -

[László Németh]

 0 files changed

New commits:
commit fddafb71f3dce47765ea39ccc459290c16683815
Author: László Németh 
Date:   Tue Sep 29 20:14:54 2015 +0200

reschedule all
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Calc] Bad rendering performance of "selected copy" snake/circulation animation

[Sylvain R]

Hi,
Sorry in advance if this is the wrong mailing list, I am basically trying to 
find a tiny bit of help to fix a rendering problem I have and hopefully submit 
a patch for it, or at least discuss the problem.
I am having some serious rendering performance problems when I perform a copy 
of cells, for some time now, which is a problem as I use Libreoffice calc 
pretty much every day as part of my job (running Libreoffice 
1:5.0.2~rc2-0ubuntu1~trusty2 on Ubuntu 14.04 64bit).
I decided I could try to fix this problem myself as I am familiar with C++. I 
am basically looking for a pointer as to where is the code that render the 
"copy cell circling effect". I am not sure how it is called, but this is what I 
am talking about at 
http://s14.postimg.org/6u32kqdq9/Screenshot_from_2015_09_28_23_13_16.png from 
B2 to I19.
Problem I have:
Right after activating this "circling effect", I can see the libreoffice 
process jumping as the top CPU user using top, it uses about 30% of one CPU 
core (I have an i7 3.4 GHz).
In itself I'd say it is bearable, but it becomes a big problem when I scroll 
down the spreadsheet. A typical issue I can reproduce every time is to move the 
mouse wheel up and down very fast over the spreadsheet:- CPU on the core goes 
to 100%.- Libreoffice renders the cells up and down as one would expect when 
scrolling up and down, BUT the speed at which it does it is very slow, and it 
can take many seconds between "me not touching the mouse wheel anymore" and the 
up and down to stop.
There is clearly a slow rendering process going on, coupled with the queuing of 
all the scrolling events.
What I am trying to figure out:- Where is the code in charge of the rendering 
of the circulating selecion?- Where is the code that receives/handles the 
scrolling?

I am really just looking for pointers (i.e. a class name or two) for where to 
start.
Thanks a lot in advance for your help.

SR___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: source/text

[Yousuf Philips]

 source/text/scalc/01/0112.xhp  |2 
 source/text/scalc/main0101.xhp |   68 +++-
 source/text/shared/01/0101.xhp |2 
 source/text/shared/01/0102.xhp |2 
 source/text/shared/01/0105.xhp |2 
 source/text/shared/01/0106.xhp |2 
 source/text/shared/01/0107.xhp |2 
 source/text/shared/01/0110.xhp |2 
 source/text/shared/01/0111.xhp |2 
 source/text/shared/01/0113.xhp |5 +-
 source/text/shared/01/0114.xhp |4 +
 source/text/shared/01/0116.xhp |2 
 source/text/shared/01/0117.xhp |2 
 source/text/shared/01/0118.xhp |4 +
 source/text/shared/01/0119.xhp |2 
 source/text/shared/01/0199.xhp |2 
 source/text/shared/01/webhtml.xhp  |2 
 source/text/shared/02/0706.xhp |3 -
 source/text/shared/autopi/0100.xhp |2 
 source/text/simpress/01/0117.xhp   |4 +
 source/text/simpress/main0101.xhp  |   53 +---
 source/text/swriter/01/0112.xhp|   48 +-
 source/text/swriter/main0101.xhp   |   70 +++--
 23 files changed, 155 insertions(+), 132 deletions(-)

New commits:
commit 54f47c030184e70a78b29b81868bef43c4c7d172
Author: Yousuf Philips 
Date:   Sat Sep 12 10:52:36 2015 +0400

tdf#92825 Fix the file menu in writer, calc, and impress

Change-Id: I2deb95d101073ac452b9088e4062c7a3a75bea81
Reviewed-on: https://gerrit.libreoffice.org/18515
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/text/scalc/01/0112.xhp 
b/source/text/scalc/01/0112.xhp
index 2ae5a1e..b776ef0 100644
--- a/source/text/scalc/01/0112.xhp
+++ b/source/text/scalc/01/0112.xhp
@@ -29,11 +29,13 @@
 
 
 
+
 
 
 Print 
Preview
 Displays a preview of the printed 
page or closes the preview.
 
+
 
   
 
diff --git a/source/text/scalc/main0101.xhp b/source/text/scalc/main0101.xhp
index 3ef15e8..6784ada 100644
--- a/source/text/scalc/main0101.xhp
+++ b/source/text/scalc/main0101.xhp
@@ -1,7 +1,5 @@
 
-
-
-
+
 
+-->
 
-
-   
 
-
-File
-/text/scalc/main0101.xhp
-
+  
+File
+/text/scalc/main0101.xhp
+  
 
+
 
+
+
 
-File
-These commands apply to the current document, open a 
new document, or close the application.
+
+
+File
+These commands apply to the current document, open a new document, or 
close the application.
 
-
-Open
-
-
-
-
-
-Save As
-
-
-
-Versions
-
+
+
+
+
+
+
+
+
+
+
+
 
 
-
+
+
+
+
+
+
 
-Properties
-
-
-
-
-Print
-
-Printer Setup
-
-
+
 
+
 
diff --git a/source/text/shared/01/0101.xhp 
b/source/text/shared/01/0101.xhp
index 6e161ad..4171f31 100644
--- a/source/text/shared/01/0101.xhp
+++ b/source/text/shared/01/0101.xhp
@@ -31,12 +31,14 @@
 
 
 
+
 
 
 
 New
 Creates a new $[officename] 
document.
 
+
 
 Creates a 
new $[officename] document. Click the arrow to select the document 
type.
 
diff --git a/source/text/shared/01/0102.xhp 
b/source/text/shared/01/0102.xhp
index d2344de..c9a1238 100644
--- a/source/text/shared/01/0102.xhp
+++ b/source/text/shared/01/0102.xhp
@@ -40,11 +40,13 @@
   documents; styles changed
   styles; 'changed' message
 mw replaced "wildcards" by "regular 
expressions"mw deleted "regular expressions;" and 
"files;"
+
 
 
 Open
   Opens or imports a 
file.
 
+
 
 
 
diff --git a/source/text/shared/01/0105.xhp 
b/source/text/shared/01/0105.xhp
index 2d82d70..86144e3 100644
--- a/source/text/shared/01/0105.xhp
+++ b/source/text/shared/01/0105.xhp
@@ -27,6 +27,7 @@
 
 
 
+
 
 documents; closing
 closing;documents
@@ -36,6 +37,7 @@
 Close
 Closes the current document without 
exiting the program.
 
+
 
 
 
diff --git a/source/text/shared/01/0106.xhp 
b/source/text/shared/01/0106.xhp
index 398d7da..fd22c25 100644
--- a/source/text/shared/01/0106.xhp
+++ b/source/text/shared/01/0106.xhp
@@ -31,12 +31,14 @@
 
 
 
+
 
 
 
 Save
 Saves the current 
document.
 
+
 
   
 
diff --git a/source/text/shared/01/0107.xhp 
b/source/text/shared/01/0107.xhp
index b38ccfa..0512864 100644
--- a/source/text/shared/01/0107.xhp
+++ b/source/text/shared/01/0107.xhp
@@ -29,6 +29,7 @@
 
 
 
+
 saving as command; 
precautions
 
 
@@ -36,6 +37,7 @@
 Save As
 Saves the current document in a different location, 
or with a different file name or file type.
 
+
 
   
 
diff --git a/source/text/shared/01/0110.xhp 
b/source/text/shared/01/0110.xhp
index bd534ad..5d42267 100644
--- a/source/text/shared/01/0110.xhp
+++ b/source/text/shared/01/0110.xhp
@@ -27,12 +27,14 @@
 
 
 
+
 
 
 Document 
Properties
 
 Displays the properties for the current file, 
including statistics such as word count and the date the file was 
created.
 UFI: removed a note
+
 
   
 
diff --git a/source/text/shared/01/0111.xhp 
b/source/text/shared/01/0111.xhp
index e4e06c6

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Michael Meeks]

 sc/source/ui/view/tabview3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 064b759c4973d2735155ed71eb534093eae4da25
Author: Michael Meeks 
Date:   Tue Sep 29 16:05:15 2015 +0100

tdf#93922 - dispose the calc InputHintWindow properly.

Change-Id: I5c331380b872429cf1fa3908c6add8de879c9ed2
Reviewed-on: https://gerrit.libreoffice.org/18927
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index e7ffbed..ad84f1b 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -662,7 +662,7 @@ bool ScTabView::HasHintWindow() const
 
 void ScTabView::RemoveHintWindow()
 {
-mpInputHintWindow.reset();
+mpInputHintWindow.disposeAndClear();
 }
 
 // find window that should not be over the cursor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Yousuf Philips]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 796fc2b502f046b15cdc1a25d982e155b12fffb8
Author: Yousuf Philips 
Date:   Sat Sep 12 10:52:36 2015 +0400

Updated core
Project: help  54f47c030184e70a78b29b81868bef43c4c7d172

tdf#92825 Fix the file menu in writer, calc, and impress

Change-Id: I2deb95d101073ac452b9088e4062c7a3a75bea81
Reviewed-on: https://gerrit.libreoffice.org/18515
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index fa9b83d..54f47c0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fa9b83defffcd6a10aacf8f97106cd17054855cc
+Subproject commit 54f47c030184e70a78b29b81868bef43c4c7d172
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[tagezi]

 AllLangHelp_scalc.mk|1 
 source/text/scalc/01/04060106.xhp   |4 
 source/text/scalc/01/func_aggregate.xhp |  454 
 3 files changed, 459 insertions(+)

New commits:
commit fa9b83defffcd6a10aacf8f97106cd17054855cc
Author: tagezi 
Date:   Thu Sep 24 08:39:22 2015 +0300

tdf#85228 Added description of AGGREGATE function

UPD: Changed in accordance with the comment of Regina (10:36 PM)
UPD: Corrected separators in the syntax
UPD: set up tags 

Change-Id: I05993ffec8af8dd1e997b3d2ae92ba0226b1bf28
Reviewed-on: https://gerrit.libreoffice.org/18821
Reviewed-by: Regina Henschel 
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 9afb052..90abc10 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -180,6 +180,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/12120200 \
 helpcontent2/source/text/scalc/01/12120300 \
 helpcontent2/source/text/scalc/01/format_graphic \
+helpcontent2/source/text/scalc/01/func_aggregate \
 helpcontent2/source/text/scalc/01/func_date \
 helpcontent2/source/text/scalc/01/func_datedif \
 helpcontent2/source/text/scalc/01/func_datevalue \
diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index d08f30c..2cb6846 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -131,6 +131,10 @@ oldref="85">Example
 
 =ACOTH(1.1) returns inverse hyperbolic cotangent of 
1.1, approximately 1.52226.see also ACOSH, ASINH, ATANH, 
COSH, SINH, TANH, COTH
 
+
+
+
+
 
 ASIN function
 
diff --git a/source/text/scalc/01/func_aggregate.xhp 
b/source/text/scalc/01/func_aggregate.xhp
new file mode 100644
index 000..4d8e26b
--- /dev/null
+++ b/source/text/scalc/01/func_aggregate.xhp
@@ -0,0 +1,454 @@
+
+
+
+
+
+  
+AGGREGATE function
+/text/scalc/01/func_aggregate.xhp
+  
+
+
+
+
+
+
+
+
+  AGGREGATE function
+
+
+
+AGGREGATE 
function
+This function 
returns an aggregate result of the calculations in the range. You can use 
different aggregate functions listed below. The Aggregate function enables you 
to omit hidden rows, errors, SUBTOTAL and other AGGREGATE function results in 
the calculation.
+
+AGGREGATE 
function is applied to vertical ranges of data with activated AutoFilter. If 
AutoFilter is not activated, automatic recalculation of the function result 
does not work for newly hidden rows. It is not supposed to work with horizontal 
ranges, however it can be applied to them as well, but with limitations. In 
particular, the AGGREGATE function applied to a horizontal data range does not 
recognize hiding columns, however correctly omits errors and results of 
SUBTOTAL and other AGGREGATE functions embedded into the row. 
+
+Syntax
+AGGREGATE(Function; Option; Ref1 [; Ref2 [; …]])
+or
+AGGREGATE(Function; Option; Array [; k])
+Function – obligatory argument. A function 
index or a reference to a cell with value from 1 to 19, in accordance with the 
following table. 
+
+
+  
+
+  Function index
+
+
+  Function applied
+
+  
+  
+
+  1
+
+
+  AVERAGE
+
+  
+  
+
+  2
+
+
+  COUNT
+
+  
+  
+
+  3
+
+
+  COUNTA
+
+  
+  
+
+  4
+
+
+  MAX
+
+  
+  
+
+  5
+
+
+  MIN
+
+  
+  
+
+  6
+
+
+  PRODUCT
+
+  
+  
+
+  7
+
+
+  STDEV.S
+
+  
+  
+
+  8
+
+
+  STDEV.P
+
+  
+  
+
+  9
+
+
+  SUM
+
+  
+  
+
+  10
+
+
+  VAR.S
+
+  
+  
+
+  11
+
+
+  VAR.P
+
+  
+  
+
+  12
+
+
+  MEDIAN
+
+  
+  
+
+  13
+
+
+  MODE.SNGL
+
+  
+  
+
+  14
+
+
+  LARGE
+
+  
+  
+
+  15
+
+
+  SMALL
+
+  
+  
+
+  16
+
+
+  PERCENTILE.INC 
+
+  
+  
+
+  17
+
+
+  QUARTILE.INC
+
+  
+  
+
+  18
+
+
+  PERCENTILE.EXC
+
+  
+  
+
+  19
+
+
+  QUARTILE.EXC
+
+  
+
+
+Option – obligatory argument. An option index 
or reference to a cell with value from 0 to 7 determines what to ignore in the 
range for the function.
+
+
+  
+
+  Option index
+
+
+  Option applied
+
+  
+  
+
+  0
+
+
+  Ignore only nested SUBTOTAL and AGGREGATE functions 

+
+  
+  
+
+  1
+
+
+  Ignore only hidden rows, nested SUBTOTAL and AGGREGATE 
functions 
+
+  
+  
+
+  2
+
+
+  Ignore only errors, nested SUBTOTAL and AGGREGATE functions 

+
+  
+  
+
+  3
+
+
+  Ignore hidden rows, errors, nested SUBTOTAL and AGGREGATE 
functions
+
+  
+  
+

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0a8b89753c673695146b950ddec66e1ee02cb55
Author: tagezi 
Date:   Thu Sep 24 08:39:22 2015 +0300

Updated core
Project: help  fa9b83defffcd6a10aacf8f97106cd17054855cc

tdf#85228 Added description of AGGREGATE function

UPD: Changed in accordance with the comment of Regina (10:36 PM)
UPD: Corrected separators in the syntax
UPD: set up tags 

Change-Id: I05993ffec8af8dd1e997b3d2ae92ba0226b1bf28
Reviewed-on: https://gerrit.libreoffice.org/18821
Reviewed-by: Regina Henschel 
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index dd688ed..fa9b83d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dd688ed491a98962477406ac75b6dc149b90f5ed
+Subproject commit fa9b83defffcd6a10aacf8f97106cd17054855cc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sccomp/source

[Pedro Giffuni]

 sccomp/source/solver/solver.cxx |   19 ++-
 sccomp/source/solver/solver.hrc |   11 ++-
 sccomp/source/solver/solver.hxx |1 +
 sccomp/source/solver/solver.src |7 +--
 4 files changed, 30 insertions(+), 8 deletions(-)

New commits:
commit 389cc5a97f0d3fbf88fa15b92e849d821131ba6c
Author: Pedro Giffuni 
Date:   Tue Sep 29 15:45:47 2015 +

Minor formatting fix

diff --git a/sccomp/source/solver/solver.hxx b/sccomp/source/solver/solver.hxx
index 5e161f2..7f69f0b 100644
--- a/sccomp/source/solver/solver.hxx
+++ b/sccomp/source/solver/solver.hxx
@@ -56,8 +56,7 @@ class SolverComponent : public 
comphelper::OMutexAndBroadcastHelper,
 sal_Int32  
   mnTimeout;
 sal_Int32  
   mnEpsilonLevel;
 sal_Bool   
   mbLimitBBDepth;
-sal_Bool
- mbNonLinearTest;
+sal_Bool   
   mbNonLinearTest;
 // results
 sal_Bool   
   mbSuccess;
 double 
   mfResultValue;
commit 899f3a1c6c24f71efabfbcaa0238308037cf830b
Author: Pedro Giffuni 
Date:   Tue Sep 29 15:04:00 2015 +

i124091 - Reinstate the check for nonlinearity but turn it into an option.

We only really support a linear solver at this time so the test for
non-linearity was actually useful. Make it optional (ON by default)
so that we can now override the check and provide a solution.

diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index ca4ce39..496edcd 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -58,6 +58,7 @@ using ::rtl::OUString;
 #define STR_TIMEOUT   "Timeout"
 #define STR_EPSILONLEVEL  "EpsilonLevel"
 #define STR_LIMITBBDEPTH  "LimitBBDepth"
+#define STR_NONLINEARTEST "NonLinearTest"
 
 // ---
 //  Resources from tools are used for translated strings
@@ -82,7 +83,8 @@ namespace
 PROP_INTEGER,
 PROP_TIMEOUT,
 PROP_EPSILONLEVEL,
-PROP_LIMITBBDEPTH
+PROP_LIMITBBDEPTH,
+PROP_NONLINEARTEST
 };
 }
 
@@ -146,6 +148,7 @@ SolverComponent::SolverComponent( const 
uno::Reference&
 mnTimeout( 120 ),
 mnEpsilonLevel( 0 ),
 mbLimitBBDepth( sal_True ),
+mbNonLinearTest( sal_True ),
 mbSuccess( sal_False ),
 mfResultValue( 0.0 )
 {
@@ -155,6 +158,7 @@ SolverComponent::SolverComponent( const 
uno::Reference&
 registerProperty( C2U(STR_TIMEOUT),  PROP_TIMEOUT,  0, &mnTimeout, 
 getCppuType( &mnTimeout )  );
 registerProperty( C2U(STR_EPSILONLEVEL), PROP_EPSILONLEVEL, 0, 
&mnEpsilonLevel, getCppuType( &mnEpsilonLevel ) );
 registerProperty( C2U(STR_LIMITBBDEPTH), PROP_LIMITBBDEPTH, 0, 
&mbLimitBBDepth, getCppuType( &mbLimitBBDepth ) );
+registerProperty( C2U(STR_NONLINEARTEST), PROP_NONLINEARTEST, 0, 
&mbNonLinearTest, getCppuType( &mbNonLinearTest ) );
 }
 
 SolverComponent::~SolverComponent()
@@ -214,6 +218,9 @@ OUString SAL_CALL SolverComponent::getPropertyDescription( 
const OUString& rProp
 case PROP_LIMITBBDEPTH:
 nResId = RID_PROPERTY_LIMITBBDEPTH;
 break;
+case PROP_NONLINEARTEST:
+nResId = RID_PROPERTY_NONLINEARTEST;
+break;
 default:
 {
 // unknown - leave empty
@@ -369,6 +376,16 @@ void SAL_CALL SolverComponent::solve() 
throw(uno::RuntimeException)
 double fInitial = aCellsIter->second.front();
 double fCoeff   = aCellsIter->second.back();   // last 
appended: coefficient for this variable
 double fTwo = lcl_GetValue( mxDoc, aCellsIter->first );
+
+  if ( mbNonLinearTest )
+  {
+  bool bLinear ( sal_True );
+  bLinear = rtl::math::approxEqual( fTwo, fInitial + 2.0 * fCoeff 
) ||
+  rtl::math::approxEqual( fInitial, fTwo - 2.0 * fCoeff );
+// second comparison is needed in case fTwo is zero
+  if ( !bLinear )
+  maStatus = lcl_GetResourceString( RID_ERROR_NONLINEAR );
+   }
 }
 
 lcl_SetValue( mxDoc, *aVarIter, 0.0 );  // set back to zero for 
examining next variable
diff --git a/sccomp/source/solver/solver.hrc b/sccomp/source/solver/solver.hrc
index 9b75f45..0405651 100644
--- a/sccomp/source/solver/solver.hrc
+++ b/sccomp/source/solver/solver.hrc
@@ -31,11 +31,12 @@
 #define RID_PROPERTY_TIMEOUT(SOLVER_RESOURCE_START + 3)
 #define RID_PROPERTY_EPSILONLEVEL   (SOLVER_RESOURCE_START + 4)
 #define RID_PROPERTY_LIMITBBDEPTH   (SOLVER_RESOURCE_START + 5)
-#define RID_ERROR_NONLINEAR

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/gdi/salmisc.cxx |  104 +++--
 1 file changed, 54 insertions(+), 50 deletions(-)

New commits:
commit 318bbe8a6d8e7f661de934f83c7b12ec845e4068
Author: Caolán McNamara 
Date:   Tue Sep 29 14:07:07 2015 +0100

reorganize so arrays are allocated with same variables as access limits

in an effort to unroll this for coverity, no logic change intended

Change-Id: Ifbb0ec6d8c4d6f1dfe809f9fecdf3af4f87399e3

diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index f6222ca..43e4503 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -66,7 +66,7 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, 
BitmapBuffer& rDstBuff
   FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
   Scanline* pSrcScanMap, Scanline* pDstScanMap, long* 
pMapX, long* pMapY )
 {
-const long  nWidth = rDstBuffer.mnWidth, nHeight = 
rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
+const long  nHeight1 = rDstBuffer.mnHeight - 1;
 const ColorMask&rSrcMask = rSrcBuffer.maColorMask;
 const ColorMask&rDstMask = rDstBuffer.maColorMask;
 BitmapPalette   aColMap( rSrcBuffer.maPalette.GetEntryCount() );
@@ -83,11 +83,12 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, 
BitmapBuffer& rDstBuff
 pColMapBuf[ i ] = aIndex;
 }
 
-for( long nActY = 0, nMapY; nActY < nHeight; nActY++ )
+for (long nActY = 0; nActY < rDstBuffer.mnHeight; ++nActY)
 {
-Scanline pSrcScan( pSrcScanMap[ nMapY = pMapY[ nActY ] ] ), pDstScan( 
pDstScanMap[ nActY ] );
+long nMapY = pMapY[nActY];
+Scanline pSrcScan(pSrcScanMap[nMapY]), pDstScan(pDstScanMap[nActY]);
 
-for( long nX = 0L; nX < nWidth; nX++ )
+for (long nX = 0L; nX < rDstBuffer.mnWidth; ++nX)
 pFncSetPixel( pDstScan, nX, pColMapBuf[ pFncGetPixel( pSrcScan, 
pMapX[ nX ], rSrcMask ).GetIndex() ], rDstMask );
 
 DOUBLE_SCANLINES();
@@ -98,7 +99,7 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, 
BitmapBuffer& rDstBuffe
  FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
  Scanline* pSrcScanMap, Scanline* pDstScanMap, long* 
pMapX, long* pMapY )
 {
-const long  nWidth = rDstBuffer.mnWidth, nHeight = 
rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
+const long  nHeight1 = rDstBuffer.mnHeight - 1;
 const ColorMask&rSrcMask = rSrcBuffer.maColorMask;
 const ColorMask&rDstMask = rDstBuffer.maColorMask;
 const BitmapColor*  pColBuf = rSrcBuffer.maPalette.ImplGetColorBuffer();
@@ -109,11 +110,12 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, 
BitmapBuffer& rDstBuffe
 const BitmapColor   aCol1( pColBuf[ 1 ] );
 longnMapX;
 
-for( long nActY = 0, nMapY; nActY < nHeight; nActY++ )
+for (long nActY = 0; nActY < rDstBuffer.mnHeight; ++nActY)
 {
-Scanline pSrcScan( pSrcScanMap[ nMapY = pMapY[ nActY ] ] ), 
pDstScan( pDstScanMap[ nActY ] );
+long nMapY = pMapY[nActY];
+Scanline pSrcScan(pSrcScanMap[nMapY]), 
pDstScan(pDstScanMap[nActY]);
 
-for( long nX = 0L; nX < nWidth; )
+for (long nX = 0L; nX < rDstBuffer.mnWidth;)
 {
 nMapX = pMapX[ nX ];
 pFncSetPixel( pDstScan, nX++,
@@ -128,11 +130,12 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, 
BitmapBuffer& rDstBuffe
 {
 long nMapX;
 
-for( long nActY = 0, nMapY; nActY < nHeight; nActY++ )
+for (long nActY = 0; nActY < rDstBuffer.mnHeight; ++nActY)
 {
-Scanline pSrcScan( pSrcScanMap[ nMapY = pMapY[ nActY ] ] ), 
pDstScan( pDstScanMap[ nActY ] );
+long nMapY = pMapY[nActY];
+Scanline pSrcScan(pSrcScanMap[nMapY]), 
pDstScan(pDstScanMap[nActY]);
 
-for( long nX = 0L; nX < nWidth; )
+for (long nX = 0L; nX < rDstBuffer.mnWidth;)
 {
 nMapX = pMapX[ nX ];
 pFncSetPixel( pDstScan, nX++,
@@ -145,11 +148,12 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, 
BitmapBuffer& rDstBuffe
 }
 else if( BMP_SCANLINE_FORMAT( rSrcBuffer.mnFormat ) == BMP_FORMAT_8BIT_PAL 
)
 {
-for( long nActY = 0, nMapY; nActY < nHeight; nActY++ )
+for (long nActY = 0; nActY < rDstBuffer.mnHeight; ++nActY)
 {
-Scanline pSrcScan( pSrcScanMap[ nMapY = pMapY[ nActY ] ] ), 
pDstScan( pDstScanMap[ nActY ] );
+long nMapY = pMapY[nActY];
+Scanline pSrcScan(pSrcScanMap[nMapY]), 
pDstScan(pDstScanMap[nActY]);
 
-for( long nX = 0L; nX < nWidth; nX++ )
+for (long nX = 0L; nX < rDstBuffer.mnWidth; ++nX)
 pFncSetPixel( pDstScan, nX, pColBuf[ pSrcScan[ pMapX[ nX ] ] 
], rDstMask );
 
 DOUBLE_

[Libreoffice-commits] core.git: sc/source

[Michael Meeks]

 sc/source/ui/view/tabview3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e163b0db5407a23396e352e96fda1db82dbacf8
Author: Michael Meeks 
Date:   Tue Sep 29 16:05:15 2015 +0100

tdf#93922 - dispose the calc InputHintWindow properly.

Change-Id: I5c331380b872429cf1fa3908c6add8de879c9ed2

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 2cbc080..1b84422 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -666,7 +666,7 @@ bool ScTabView::HasHintWindow() const
 
 void ScTabView::RemoveHintWindow()
 {
-mpInputHintWindow.reset();
+mpInputHintWindow.disposeAndClear();
 }
 
 // find window that should not be over the cursor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/layer/tile/TileLayer.js |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 584f6075b440aafc76b755a453c3698a9529758a
Author: Mihai Varga 
Date:   Tue Sep 29 17:50:08 2015 +0300

loleaflet: fit document horizontally when resizing the window

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index fd8771a..0bf5474 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -105,6 +105,7 @@ L.TileLayer = L.GridLayer.extend({
map.on('dragstart', this._onDragStart, this);
map.on('requestloksession', this._onRequestLOKSession, this);
map.on('error', this._mapOnError, this);
+   map.on('resize', this._fitDocumentHorizontally, this);
for (var key in this._selectionHandles) {
this._selectionHandles[key].on('drag dragend', 
this._onSelectionHandleDrag, this);
}
@@ -671,6 +672,23 @@ L.TileLayer = L.GridLayer.extend({
 
_onRequestLOKSession: function () {
L.Socket.sendMessage('requestloksession');
+   },
+
+   _fitDocumentHorizontally: function (e) {
+   if (this._docType !== 'spreadsheet') {
+   var crsScale = this._map.options.crs.scale(1);
+   if (this._docPixelSize.x > e.newSize.x) {
+   var ratio = this._docPixelSize.x / e.newSize.x;
+   var zoomDelta = Math.ceil(Math.log(ratio) / 
Math.log(crsScale));
+   this._map.setZoom(Math.max(1, 
this._map.getZoom() - zoomDelta), {animate: false});
+   }
+   else if (e.newSize.x / this._docPixelSize.x > crsScale) 
{
+   // we could zoom in
+   var ratio = e.newSize.x / this._docPixelSize.x;
+   var zoomDelta = Math.ceil(Math.log(ratio) / 
Math.log(crsScale));
+   this._map.setZoom(Math.min(10, 
this._map.getZoom() + zoomDelta), {animate: false});
+   }
+   }
}
 });
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/source svl/source

[Eike Rathke]

 sc/source/ui/view/tabvwsha.cxx |   14 +--
 svl/source/numbers/zformat.cxx |   52 +++--
 2 files changed, 37 insertions(+), 29 deletions(-)

New commits:
commit ef0a26835e68deb31906c40cfe48c66674d9d0d1
Author: Eike Rathke 
Date:   Tue Sep 29 15:54:19 2015 +0200

use exponential 'E' format for General when appropriate

Fixes all these test case scenarios:
1. in A1 enter =1E222
   * move cell cursor back onto A1
   * status bar displays Sum=10... repeated until
 filled (or 222 '0' characters)
2. invoke number format dialog on A1
   * for General format 10... is displayed in the preview
3. move cell cursor to A2
   * open Function Wizard (Ctrl+F2)
   * choose (double click) ABS function
   * enter A1 as parameter
   * see 10... displayed as Function result and Result
4. save as .ods
   * in content.xml see display text of A1 being saved as 10...

Change-Id: I7c22c0461a6783c85c1d51c31e8607fb2edb821c

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 2dc1c54..eccf63f 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -54,6 +54,11 @@ char const GREGORIAN[] = "gregorian";
 
 const sal_uInt16 UPPER_PRECISION = 300; // entirely arbitrary...
 const double EXP_LOWER_BOUND = 1.0E-4; // prefer scientific notation below 
this value.
+const double EXP_ABS_UPPER_BOUND = 1.0E15;  // use exponential notation above 
that absolute value.
+// Back in time was E16 that lead
+// to display rounding errors, see
+// also sal/rtl/math.cxx
+// doubleToString()
 
 } // namespace
 
@@ -1733,7 +1738,7 @@ void SvNumberformat::ImpGetOutputStandard(double& 
fNumber, OUString& rOutString)
 {
 sal_uInt16 nStandardPrec = rScan.GetStandardPrec();
 
-if ( fabs(fNumber) > 1.0E15 ) // #58531# was E16
+if ( fabs(fNumber) > EXP_ABS_UPPER_BOUND )
 {
 nStandardPrec = ::std::min(nStandardPrec, 
static_cast(14)); // limits to 14 decimals
 rOutString = ::rtl::math::doubleToUString( fNumber,
@@ -2126,27 +2131,40 @@ bool SvNumberformat::GetOutputString(double fNumber,
 }
 fNumber = -fNumber;
 }
+/* TODO: why did we insist on 10 decimals for the non-exponent
+ * case? doubleToUString() handles rtl_math_DecimalPlaces_Max
+ * gracefully when used with rtl_math_StringFormat_Automatic,
+ * so all that special casing and mumbo-jumbo in the else
+ * branch below might not be needed at all. */
+if (fNumber > EXP_ABS_UPPER_BOUND)
+{
+sBuff.append( ::rtl::math::doubleToUString( fNumber,
+rtl_math_StringFormat_Automatic,
+rtl_math_DecimalPlaces_Max,
+GetFormatter().GetNumDecimalSep()[0], true));
+}
+else
 {
 OUString sTemp;
 ImpGetOutputStdToPrecision(fNumber, sTemp, 10); // Use 10 
decimals for general 'unlimited' format.
 sBuff.append(sTemp);
-}
-if (fNumber < EXP_LOWER_BOUND)
-{
-sal_Int32 nLen = sBuff.getLength();
-if (!nLen)
+if (fNumber < EXP_LOWER_BOUND)
 {
-return false;
-}
-// #i112250# With the 10-decimal limit, small numbers are 
formatted as "0".
-// Switch to scientific in that case, too:
-if (nLen > 11 || ((nLen == 1 && sBuff[0] == '0') && 
fNumber != 0.0))
-{
-sal_uInt16 nStandardPrec = rScan.GetStandardPrec();
-nStandardPrec = ::std::min(nStandardPrec, 
static_cast(14)); // limits to 14 decimals
-sBuff = ::rtl::math::doubleToUString( fNumber,
-  
rtl_math_StringFormat_E2, nStandardPrec /*2*/,
-  
GetFormatter().GetNumDecimalSep()[0], true);
+sal_Int32 nLen = sBuff.getLength();
+if (!nLen)
+{
+return false;
+}
+// #i112250# With the 10-decimal limit, small numbers 
are formatted as "0".
+// Switch to scientific in that case, too:
+if (nLen > 11 || ((nLen == 1 && sBuff[0] == '0') && 
fNumber != 0.0))
+{
+ 

[Libreoffice-commits] core.git: Changes to 'feature/notebookbar'

[Jan Holesovsky]

New branch 'feature/notebookbar' available with the following commits:
commit dbf9664d16e7f80d269532d369d71c57322ac5ca
Author: Jan Holesovsky 
Date:   Thu Sep 11 14:10:21 2014 +0200

vcl: Proof-of-concept NotebookBar implementation.

Change-Id: I91535c13d68261f7195989ec78bd305cf572c87c

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes10' - vcl/source

[Tomaž Vajngerl]

 vcl/source/gdi/impimage.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 53501b4b339926485417d670fefcc59c7bc044cf
Author: Tomaž Vajngerl 
Date:   Tue Sep 29 15:43:14 2015 +0200

don't create "disabled" image - only to measure perf. impact

Change-Id: Ic5541dfcb381fe1200cf47bd0cf8803f5348b2a7

diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 067b6e8..220d08f 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -349,7 +349,9 @@ pOutDev
 
 void ImplImageBmp::ImplUpdateDisabledBmpEx( int nPos )
 {
-const Size aTotalSize( maBmpEx.GetSizePixel() );
+maDisabledBmpEx = maBmpEx;
+
+/*const Size aTotalSize( maBmpEx.GetSizePixel() );
 
 if( maDisabledBmpEx.IsEmpty() )
 {
@@ -397,7 +399,7 @@ void ImplImageBmp::ImplUpdateDisabledBmpEx( int nPos )
 Bitmap::ReleaseAccess( pGrey );
 aGreyAlphaMask.ReleaseAccess( pGreyAlphaMask );
 
-maDisabledBmpEx = BitmapEx( aGrey, aGreyAlphaMask );
+maDisabledBmpEx = BitmapEx( aGrey, aGreyAlphaMask );*/
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/inc starmath/source

[Takeshi Abe]

 starmath/inc/node.hxx|   15 +--
 starmath/source/node.cxx |4 
 2 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 4672445c1ab501550d554db7519e44516001fea3
Author: Takeshi Abe 
Date:   Tue Sep 29 20:30:20 2015 +0900

starmath: ClaimPaternity() is only for SmStructureNode

rather than SmNode.

Change-Id: I2c4765500f077007979417b90f47cc22c6362491
Reviewed-on: https://gerrit.libreoffice.org/18917
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 1ca0db7..0f4eb1b 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -222,9 +222,7 @@ public:
 void SetToken(SmToken& token){
 aNodeToken = token;
 }
-protected:
-/** Sets parent on children of this node */
-inline void ClaimPaternity();
+
 private:
 SmStructureNode* aParentNode;
 };
@@ -336,15 +334,12 @@ public:
 aSubNodes[nIndex] = pNode;
 ClaimPaternity();
 }
+
+private:
+/** Sets parent on children of this node */
+void ClaimPaternity();
 };
 
-inline void SmNode::ClaimPaternity() {
-SmNode* pNode;
-sal_uInt16  nSize = GetNumSubNodes();
-for (sal_uInt16 i = 0;  i < nSize;  i++)
-if (NULL != (pNode = GetSubNode(i)))
-pNode->SetParent(static_cast(this)); //Cast is 
valid if we have children
-}
 
 /** Abstract base class for all visible node
  *
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 31ee52a..74e5137 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -624,6 +624,10 @@ void SmStructureNode::GetAccessibleText( OUStringBuffer 
&rText ) const
 }
 
 
+void SmStructureNode::ClaimPaternity()
+{
+ForEachNonNull(this, [this](SmNode *pNode){pNode->SetParent(this);});
+}
 
 
 bool SmVisibleNode::IsVisible() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc

[Caolán McNamara]

 vcl/inc/headless/svpinst.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 64a3c4d9e272ba6eefe8bcd6a3e0ca4462b7aca1
Author: Caolán McNamara 
Date:   Tue Sep 29 12:30:54 2015 +0100

m_pData is always a ImplSVEvent

Change-Id: I0207419ac1b2ecdf36f208169766d965ae48ad8c

diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 0c9fa4a..4a4e907 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -69,10 +69,10 @@ class VCL_DLLPUBLIC SvpSalInstance : public 
SalGenericInstance
 struct SalUserEvent
 {
 const SalFrame* m_pFrame;
-void*   m_pData;
+ImplSVEvent*m_pData;
 sal_uInt16  m_nEvent;
 
-SalUserEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent = 
SALEVENT_USEREVENT )
+SalUserEvent( const SalFrame* pFrame, ImplSVEvent* pData, sal_uInt16 
nEvent = SALEVENT_USEREVENT )
 : m_pFrame( pFrame ),
   m_pData( pData ),
   m_nEvent( nEvent )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/source basic/source compilerplugins/clang cui/source dbaccess/source extensions/source filter/source forms/source framework/inc framework/source hwpfilter/sourc

[Noel Grandin]

 basegfx/source/inc/hommatrixtemplate.hxx   |   22 --
 basic/source/inc/runtime.hxx   |3 
 basic/source/runtime/iosys.cxx |7 --
 compilerplugins/clang/unusedmethods.cxx|8 --
 cui/source/inc/treeopt.hxx |5 -
 dbaccess/source/ui/dlg/DriverSettings.hxx  |4 -
 dbaccess/source/ui/inc/ConnectionLineData.hxx  |3 
 dbaccess/source/ui/inc/TableWindow.hxx |1 
 dbaccess/source/ui/inc/WCPage.hxx  |2 
 dbaccess/source/ui/inc/dbwiz.hxx   |1 
 dbaccess/source/ui/inc/dbwizsetup.hxx  |1 
 dbaccess/source/ui/inc/indexcollection.hxx |2 
 dbaccess/source/ui/inc/indexdialog.hxx |2 
 dbaccess/source/ui/inc/indexfieldscontrol.hxx  |3 
 dbaccess/source/ui/inc/propertysetitem.hxx |3 
 extensions/source/propctrlr/commoncontrol.hxx  |   13 
 extensions/source/propctrlr/standardcontrol.hxx|   27 
 extensions/source/resource/ResourceIndexAccess.cxx |   11 ---
 extensions/source/resource/ResourceIndexAccess.hxx |2 
 filter/source/graphicfilter/icgm/cgm.hxx   |2 
 forms/source/inc/listenercontainers.hxx|6 -
 framework/inc/classes/checkediterator.hxx  |   46 --
 framework/inc/uielement/menubarmerger.hxx  |1 
 framework/source/layoutmanager/helpers.hxx |1 
 hwpfilter/source/drawing.h |   35 --
 idl/inc/bastype.hxx|3 
 idl/inc/globals.hxx|6 -
 idl/source/objects/bastype.cxx |   35 --
 include/basebmp/colortraits.hxx|7 --
 include/comphelper/configuration.hxx   |8 --
 include/comphelper/optional.hxx|   32 -
 include/dbaccess/ToolBoxHelper.hxx |2 
 include/editeng/adjustitem.hxx |1 
 include/editeng/hyphenzoneitem.hxx |2 
 include/editeng/lspcitem.hxx   |2 
 include/editeng/orphitem.hxx   |1 
 include/editeng/tstpitem.hxx   |2 
 include/editeng/widwitem.hxx   |1 
 include/filter/msfilter/msdffimp.hxx   |1 
 include/oox/helper/containerhelper.hxx |   24 ---
 include/oox/helper/refvector.hxx   |7 --
 include/sot/filelist.hxx   |1 
 include/store/store.hxx|   16 
 include/svl/zforlist.hxx   |   13 
 include/svtools/accessibilityoptions.hxx   |1 
 include/svtools/grfmgr.hxx |3 
 include/svx/sdr/attribute/sdrtextattribute.hxx |1 
 include/svx/svdsob.hxx |   15 
 include/svx/svdtypes.hxx   |2 
 include/svx/textchainflow.hxx  |4 -
 include/svx/unoapi.hxx |5 -
 include/tools/pstm.hxx |1 
 include/unotools/sharedunocomponent.hxx|   16 
 include/vcl/dibtools.hxx   |7 --
 include/vcl/gdimtf.hxx |   24 ---
 include/vcl/graphicfilter.hxx  |5 -
 include/vcl/helper.hxx |1 
 include/vcl/print.hxx  |3 
 include/vcl/threadex.hxx   |3 
 include/xmloff/xmlreg.hxx  |   36 ---
 opencl/inc/opencl_device.hxx   |2 
 pyuno/source/module/pyuno_impl.hxx |2 
 registry/inc/regapi.hxx|8 --
 registry/source/registry.cxx   |9 --
 rsc/inc/rsctools.hxx   |2 
 rsc/source/tools/rsctools.cxx  |   39 
 sd/source/filter/eppt/eppt.hxx |1 
 sd/source/filter/eppt/epptbase.hxx |2 
 sd/source/filter/ppt/pptanimations.hxx |1 
 sd/source/ui/dlg/RemoteDialogClientBox.hxx |2 
 sd/source/ui/inc/unosrch.hxx   |5 -
 sd/source/ui/unoidl/unoobj.hxx |1 
 sot/source/base/filelist.cxx   |   11 ---
 stoc/source/corereflection/lrucache.hxx|   14 
 stoc/source/javavm/javavm.hxx  |2 
 stoc/source/security/lru_cache.h   |   15 
 store/source/storbase.hxx  |7 --
 svtools/source/config/accessibilityoptions.cxx |4 -
 svtools/source/dialogs/mcvmath.cxx |   68 -
 svtools/source/dialogs/mcvmath.hxx |3 
 svtools/source/graphic

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/pluginhandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e710170d906fcb248a5e4ff5a3a90cbf0e20003d
Author: Stephan Bergmann 
Date:   Tue Sep 29 15:04:06 2015 +0200

Avoid ambiguity with C++14 std::make_unique

Change-Id: I81b8bed175527bab02ffdd2fa17fa6a66c243d95

diff --git a/compilerplugins/clang/pluginhandler.cxx 
b/compilerplugins/clang/pluginhandler.cxx
index 0a5af66..6506976 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -244,7 +244,7 @@ void PluginHandler::HandleTranslationUnit( ASTContext& 
context )
 #if (__clang_major__ == 3 && __clang_minor__ >= 6) || __clang_major__ > 3
 std::unique_ptr LibreOfficeAction::CreateASTConsumer( 
CompilerInstance& Compiler, StringRef )
 {
-return make_unique( Compiler, _args );
+return llvm::make_unique( Compiler, _args );
 }
 #else
 ASTConsumer* LibreOfficeAction::CreateASTConsumer( CompilerInstance& Compiler, 
StringRef )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/win

[Michael Stahl]

 vcl/win/source/gdi/winlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 106a96075da1f004da51e8103675e72e6e6d69b8
Author: Michael Stahl 
Date:   Tue Sep 29 15:02:45 2015 +0200

vcl: oops, fix windows build

Change-Id: I73135440321c7c9898f758cb7a921d62f2265bcb

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 0572b21..ac9ec6f 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1877,7 +1877,7 @@ void UniscribeLayout::GetCaretPositions( int nMaxIdx, 
long* pCaretXArray ) const
 int i;
 for( i = 0; i < nMaxIdx; ++i )
 pCaretXArray[ i ] = -1;
-std::unique_ptr const pGlyphPos = new long[mnGlyphCount + 1];
+std::unique_ptr const pGlyphPos(new long[mnGlyphCount + 1]);
 for( i = 0; i <= mnGlyphCount; ++i )
 pGlyphPos[ i ] = -1;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 10 commits - basic/source filter/source i18npool/inc l10ntools/source sax/source sc/inc sc/source toolkit/source vcl/generic vcl/osx vcl/source vcl/unx vcl/win

[Michael Stahl]

 basic/source/runtime/iosys.cxx |2 
 basic/source/sbx/sbxvar.cxx|2 
 filter/source/placeware/tempfile.cxx   |  120 -
 i18npool/inc/collatorImpl.hxx  |2 
 l10ntools/source/xmlparse.cxx  |1 
 sax/source/expatwrap/sax_expat.cxx |   40 -
 sc/inc/pch/precompiled_sc.hxx  |1 
 sc/source/core/tool/address.cxx|1 
 toolkit/source/awt/vclxfont.cxx|5 -
 toolkit/source/awt/vclxgraphics.cxx|5 -
 vcl/generic/fontmanager/fontconfig.cxx |6 -
 vcl/generic/fontmanager/fontmanager.cxx|4 
 vcl/generic/glyphs/gcach_layout.cxx|1 
 vcl/osx/salframeview.mm|1 
 vcl/source/font/PhysicalFontCollection.cxx |5 -
 vcl/source/gdi/sallayout.cxx   |   25 ++
 vcl/source/outdev/text.cxx |   28 +++---
 vcl/unx/generic/app/i18n_ic.cxx|1 
 vcl/unx/generic/gdi/salgdi3.cxx|1 
 vcl/unx/generic/printer/jobdata.cxx|7 -
 vcl/win/source/gdi/winlayout.cxx   |6 +
 21 files changed, 49 insertions(+), 215 deletions(-)

New commits:
commit ea8de68df5e7f4388bd7d9dea0bdbcf73c889875
Author: Michael Stahl 
Date:   Mon Sep 28 22:52:22 2015 +0200

vcl: Vista implies usp10.dll >= 1.600

... claims https://en.wikipedia.org/wiki/Uniscribe - #ifdef this so it
can be removed when dropping XP support.

Change-Id: I9a51635cf9bb4876faf6dca011e6da9e1c2dc35d

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 454ecae..0572b21 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -626,6 +626,7 @@ static bool bManualCellAlign = true;
 
 static void InitUSP()
 {
+#if _WIN32_WINNT < _WIN32_WINNT_VISTA
 // get the usp10.dll version info
 HMODULE usp10 = GetModuleHandle("usp10.dll");
 void *pScriptIsComplex = reinterpret_cast< void* >( GetProcAddress(usp10, 
"ScriptIsComplex"));
@@ -655,7 +656,10 @@ static void InitUSP()
 
 // #i77976# USP>=1.0600 changed the need to manually align glyphs in their 
cells
 if( nUspVersion >= 10600 )
+#endif
+{
 bManualCellAlign = false;
+}
 
 bUspInited = true;
 }
commit 28f18b68db1af3668203730ba8cfbb66103fe669
Author: Michael Stahl 
Date:   Tue Sep 29 14:25:23 2015 +0200

vcl: replace alloca() with std::unique_ptr

Change-Id: I82b982895ee422bcf5a23756df4d81c89bc47636

diff --git a/vcl/generic/fontmanager/fontconfig.cxx 
b/vcl/generic/fontmanager/fontconfig.cxx
index becb419..f6ee508 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -53,8 +53,6 @@ using namespace psp;
 
 #include "rtl/ustrbuf.hxx"
 
-#include "sal/alloca.h"
-
 #include 
 #include 
 
@@ -1086,7 +1084,7 @@ bool PrintFontManager::Substitute( FontSelectPattern 
&rPattern, OUString& rMissi
 // update rMissingCodes by removing resolved unicodes
 if( !rMissingCodes.isEmpty() )
 {
-sal_uInt32* pRemainingCodes = static_cast(alloca( 
rMissingCodes.getLength() * sizeof(sal_uInt32) ));
+std::unique_ptr const pRemainingCodes(new 
sal_uInt32[rMissingCodes.getLength()]);
 int nRemainingLen = 0;
 FcCharSet* unicodes;
 if (!FcPatternGetCharSet(pSet->fonts[0], FC_CHARSET, 0, 
&unicodes))
@@ -1099,7 +1097,7 @@ bool PrintFontManager::Substitute( FontSelectPattern 
&rPattern, OUString& rMissi
 pRemainingCodes[ nRemainingLen++ ] = nCode;
 }
 }
-OUString sStillMissing(pRemainingCodes, nRemainingLen);
+OUString sStillMissing(pRemainingCodes.get(), nRemainingLen);
 #if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
 if (get_xid_for_dbus())
 {
diff --git a/vcl/generic/fontmanager/fontmanager.cxx 
b/vcl/generic/fontmanager/fontmanager.cxx
index 56917f6..b6651b7 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -59,8 +59,6 @@
 #include 
 #endif
 
-#include "sal/alloca.h"
-
 #include 
 #include 
 #include 
@@ -472,7 +470,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( 
MultiAtomProvider* pProvider,
 
 // first transform the character codes to unicode
 // note: this only works with single byte encodings
-sal_Unicode* pUnicodes = static_cast(alloca( 
pInfo->numOfChars * sizeof(sal_Unicode)));
+std::unique_ptr const pUnicodes(new 
sal_Unicode[pInfo->numOfChars]);
 CharMetricInfo* pChar = pInfo->cmi;
 int i;
 
diff --git a/vcl/source/font/PhysicalFontCollection.cxx 
b/vcl/source/font/PhysicalFontCollection.cxx
index 26b33ed..cd89bdf 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -18,7 +18,6 @@
  *

[Libreoffice-commits] core.git: basic/source

[Caolán McNamara]

 basic/source/sbx/sbxvar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e5a8eb9e291ca01489235376e04b80d4d6bc3999
Author: Caolán McNamara 
Date:   Tue Sep 29 13:48:00 2015 +0100

fix dbgutil build

Change-Id: If2a9d330bd7fde8db5e998e97c278fb19c90f24a

diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 83538ac..36d459a 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -408,7 +408,7 @@ void SbxVariable::SetParent( SbxObject* p )
 {
 #ifdef DBG_UTIL
 // Will the parent of a SbxObject be set?
-if ( p && 0 != dynamic_cast( ) )
+if (p)
 {
 // then this had to be a child of the new parent
 bool bFound = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source

[Stephan Bergmann]

 oox/source/ole/vbaexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4290105937153de6278aac064c419361458f6463
Author: Stephan Bergmann 
Date:   Tue Sep 29 14:39:18 2015 +0200

Remove newly meaningless comment

...after d35adb0835eb57ca6ef0576781a87d829c2689d0 "Retain the original 
project
name"

Change-Id: I9b351c79914bf31f2afcc69f3888fee9ea8b10ed

diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index 83b2324..eaa8078 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -379,7 +379,7 @@ void writePROJECTCODEPAGE(SvStream& rStrm)
 void writePROJECTNAME(SvStream& rStrm, const OUString& name)
 {
 rStrm.WriteUInt16(0x0004); // id
-sal_uInt32 sizeOfProjectName = name.getLength(); // for project name 
"VBAProject"
+sal_uInt32 sizeOfProjectName = name.getLength();
 rStrm.WriteUInt32(sizeOfProjectName); // sizeOfProjectName
 exportString(rStrm, name); // ProjectName
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

 sd/source/ui/inc/ViewShellBase.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46c4be15d7529f2460c450190113444cd45aa97c
Author: Caolán McNamara 
Date:   Sat Sep 26 21:39:09 2015 +0100

boost->std

Change-Id: I26a4ac92e05f4c6ee46f32acb59fcd39d7dc2ac4
Reviewed-on: https://gerrit.libreoffice.org/18890
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/sd/source/ui/inc/ViewShellBase.hxx 
b/sd/source/ui/inc/ViewShellBase.hxx
index 8f7a0b2..2d92a7e 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -234,7 +234,7 @@ protected:
 
 private:
 class Implementation;
-::boost::scoped_ptr mpImpl;
+std::unique_ptr mpImpl;
 DrawDocShell* mpDocShell;
 SdDrawDocument* mpDocument;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Stephan Bergmann]

 sd/source/ui/view/ViewShellBase.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7aa6009a7f7132c80db7bcc4e8291ba4a3296ae5
Author: Stephan Bergmann 
Date:   Tue Sep 29 14:28:08 2015 +0200

Take care of ~ViewShellBase -> ~FormShellManager -> ViewShellBase::...

...ViewShellBase::GetEventMultiplexer call sequence, where

  OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=NULL);

would call on an already stale ViewShellBase::mpImpl if ~FromShellManager 
were
only called from within ViewShellBase::~Implementation instead of directly 
from
~ViewShellBase.

(Needed to unbreak  "boost->std" 
on
Mac OS X, where libc++ presumably nulls a std::unique_ptr early in 
~unique_ptr.)

Change-Id: I179e0d12cc049f33b5724673b65f84d7f7c3d059

diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index 461d9bf..7da0c4c 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -284,6 +284,8 @@ ViewShellBase::~ViewShellBase()
 EndListening(*GetDocShell());
 
 SetWindow(NULL);
+
+mpImpl->mpFormShellManager.reset();
 }
 
 void ViewShellBase::LateInit (const OUString& rsDefaultView)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 91293, which changed state.

Bug 91293 Summary: Links in Impress Are Removed When Exported to PPTX
https://bugs.documentfoundation.org/show_bug.cgi?id=91293

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source cui/source dbaccess/source vcl/source xmloff/source

[Oliver Specht]

 avmedia/source/framework/mediatoolbox.cxx   |2 
 basctl/source/basicide/baside2b.cxx |4 
 basic/source/basmgr/basmgr.cxx  |   12 +-
 basic/source/classes/eventatt.cxx   |   10 +-
 basic/source/classes/sb.cxx |   40 
 basic/source/classes/sbunoobj.cxx   |   76 
 basic/source/classes/sbxmod.cxx |   78 -
 basic/source/comp/sbcomp.cxx|   12 +-
 basic/source/runtime/dllmgr-none.cxx|2 
 basic/source/runtime/dllmgr-x64.cxx |   12 +-
 basic/source/runtime/dllmgr-x86.cxx |   12 +-
 basic/source/runtime/methods.cxx|   14 +--
 basic/source/runtime/methods1.cxx   |   26 ++---
 basic/source/runtime/runtime.cxx|   90 ++--
 basic/source/sbx/sbxbool.cxx|4 
 basic/source/sbx/sbxbyte.cxx|4 
 basic/source/sbx/sbxchar.cxx|4 
 basic/source/sbx/sbxcoll.cxx|4 
 basic/source/sbx/sbxcurr.cxx|4 
 basic/source/sbx/sbxdate.cxx|4 
 basic/source/sbx/sbxdbl.cxx |4 
 basic/source/sbx/sbxdec.cxx |4 
 basic/source/sbx/sbxexec.cxx|4 
 basic/source/sbx/sbxint.cxx |   12 +-
 basic/source/sbx/sbxlng.cxx |4 
 basic/source/sbx/sbxobj.cxx |   22 ++--
 basic/source/sbx/sbxsng.cxx |4 
 basic/source/sbx/sbxstr.cxx |6 -
 basic/source/sbx/sbxuint.cxx|4 
 basic/source/sbx/sbxulng.cxx|4 
 basic/source/sbx/sbxvalue.cxx   |   22 ++--
 basic/source/sbx/sbxvar.cxx |2 
 cui/source/customize/acccfg.cxx |6 -
 cui/source/dialogs/hldocntp.cxx |2 
 cui/source/dialogs/zoom.cxx |2 
 cui/source/options/cfgchart.cxx |2 
 cui/source/options/connpoolsettings.cxx |2 
 cui/source/options/dbregistersettings.cxx   |2 
 cui/source/options/optgdlg.cxx  |3 
 cui/source/tabpages/numfmt.cxx  |2 
 cui/source/tabpages/tplneend.cxx|8 -
 dbaccess/source/filter/xml/xmlColumn.cxx|7 -
 dbaccess/source/filter/xml/xmlStyleImport.cxx   |6 -
 dbaccess/source/filter/xml/xmlTable.cxx |2 
 dbaccess/source/ui/browser/brwctrlr.cxx |2 
 dbaccess/source/ui/browser/sbagrid.cxx  |2 
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |2 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx   |4 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx  |   12 +-
 dbaccess/source/ui/dlg/advancedsettings.cxx |6 -
 dbaccess/source/ui/dlg/dbadmin.cxx  |4 
 dbaccess/source/ui/dlg/dbwiz.cxx|2 
 dbaccess/source/ui/dlg/dbwizsetup.cxx   |2 
 dbaccess/source/ui/dlg/generalpage.cxx  |2 
 dbaccess/source/ui/dlg/optionalboolitem.cxx |2 
 dbaccess/source/ui/misc/propertysetitem.cxx |2 
 dbaccess/source/ui/misc/stringlistitem.cxx  |2 
 vcl/source/edit/textundo.cxx|2 
 xmloff/source/chart/SchXMLAxisContext.cxx   |4 
 xmloff/source/chart/SchXMLChartContext.cxx  |4 
 xmloff/source/chart/SchXMLLegendContext.cxx |2 
 xmloff/source/chart/SchXMLPlotAreaContext.cxx   |4 
 xmloff/source/core/xmlimp.cxx   |2 
 xmloff/source/draw/shapeimport.cxx  |2 
 xmloff/source/draw/ximppage.cxx |   10 +-
 xmloff/source/draw/ximpshap.cxx |   10 +-
 xmloff/source/draw/ximpstyl.cxx |   10 +-
 xmloff/source/forms/elementimport.cxx   |2 
 xmloff/source/style/XMLFontStylesContext.cxx|2 
 xmloff/source/text/XMLTextFrameContext.cxx  |   12 +-
 xmloff/source/text/XMLTextFrameHyperlinkContext.cxx |6 -
 xmloff/source/text/txtimp.cxx   |   18 ++--
 xmloff/source/text/txtparaimphint.hxx   |   24 ++---
 73 files changed, 356 insertions(+), 352 deletions(-)

New commits:
commit d3c7c9ea81ee7c617f8cee5b645621088aea215b
Author: Oliver Specht 
Date:   Mon Sep 28 11:42:43 2015 +0200

tdf#94559: first step to remove rtti.hxx

replaced use of PTR_CAST, IS_TYPE, ISA in
avmedia, basctl, basic, cui, dbaccess, vcl,xmloff

Change-Id: If4496762e82e896b6fbc362e6626502703c245f5
Reviewed-on: https://gerrit.libreof

[Bug 94306] Replace boost::noncopyable with plain C++11 deleted copy ctors

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=94306

--- Comment #18 from Siddharth Khabia  ---
(In reply to Kohei Yoshida from comment #15)
> (In reply to Stephan Bergmann from comment #14)
> > (In reply to Siddharth Khabia from comment #10)
> > > my apology for the earlier comment that was posted by mistake.
> > > i want to ask is that are we supposed to remove boost::noncopyable and add
> > > the code provided bu BJORN in the public part of the class ?
> > 
> > You can put those deleted members into a private section (as they cannot be
> > called anyway, as they are deleted).
> 
> Actually, Scott Meyers recommends those members be put in a public section,
> for better compiler error messages (c.f. Item 11 in Effective Modern C++).

thanks for the help ! :)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 94306] Replace boost::noncopyable with plain C++11 deleted copy ctors

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=94306

--- Comment #17 from Siddharth Khabia  ---
I will be glad to do that !
have you completed sw , i changed a few files of that ?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Stephan Bergmann]

 sc/source/filter/oox/pivotcachebuffer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2bce2365e7d411c1673e709eb1abc89da9f651dc
Author: Stephan Bergmann 
Date:   Tue Sep 29 13:55:47 2015 +0200

Work around odd -Werror=strict-overflow

"sc/source/filter/oox/pivotcachebuffer.cxx:401:45: error: assuming signed
overflow does not occur when assuming that (X + c) < X is always false" at 
least
with "g++ (GCC) 5.1.1 20150618 (Red Hat 5.1.1-4)" and --disable-debug

Change-Id: I1d267b2947f04b84f73da2b1458d316397e2374e

diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx 
b/sc/source/filter/oox/pivotcachebuffer.cxx
index e7bad2d..64da525 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -408,7 +408,7 @@ void PivotCacheItemList::importArray( SequenceInputStream& 
rStrm )
 case BIFF12_PCITEM_ARRAY_DATE:   createItem().readDate( rStrm );   
  break;
 default:
 OSL_FAIL( "PivotCacheItemList::importArray - unknown data 
type" );
-nIdx = nCount;
+return;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/map/handler/Map.Keyboard.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 229740d18b234337a5880ee0d8a67646641ce172
Author: Mihai Varga 
Date:   Tue Sep 29 14:44:55 2015 +0300

loleaflet: update unoKeyCode when we change keyCode

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index 360d797..987d2b4 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -207,6 +207,7 @@ L.Map.Keyboard = L.Handler.extend({
// Chrome sets keyCode = charCode for 
printable keys
// while LO requires it to be 0
keyCode = 0;
+   unoKeyCode = 
this._toUNOKeyCode(keyCode);
}
docLayer._postKeyboardEvent('input', charCode, 
unoKeyCode);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/source

[Pranav Kant]

 libreofficekit/source/gtk/lokdocview.cxx |   37 +++
 1 file changed, 37 insertions(+)

New commits:
commit c3ce35f0a12af2887b10987f76675174563487d7
Author: Pranav Kant 
Date:   Thu Sep 24 18:47:01 2015 +0200

lokdocview: Reset view completely

Resetting tiles only is not enough. We need to empty stale
selection rectangles, handle bars, cursor positions etc., so that
they do not interfere with next view to be opened using same
widget instance.

We are not destroying the document here, so the widget would
still point to the same document unless it is made to point to
another document by subsequent lok_doc_view_open_document calls.

Change-Id: I3c7cc789c8c7393b3793b4edf6aa96d54bc0b1a3
Reviewed-on: https://gerrit.libreoffice.org/18866
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 8d218f4..8b85c45 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1986,6 +1986,43 @@ lok_doc_view_reset_view(LOKDocView* pDocView)
 {
 LOKDocViewPrivate *priv = 
static_cast(lok_doc_view_get_instance_private (pDocView));
 priv->m_aTileBuffer.resetAllTiles();
+priv->m_nLoadProgress = 0.0;
+
+memset(&priv->m_aVisibleCursor, 0, sizeof(priv->m_aVisibleCursor));
+priv->m_bCursorOverlayVisible = false;
+priv->m_bCursorVisible = false;
+
+priv->m_nLastButtonPressTime = 0;
+priv->m_nLastButtonReleaseTime = 0;
+priv->m_aTextSelectionRectangles.clear();
+
+memset(&priv->m_aTextSelectionStart, 0, 
sizeof(priv->m_aTextSelectionStart));
+memset(&priv->m_aTextSelectionEnd, 0, sizeof(priv->m_aTextSelectionEnd));
+memset(&priv->m_aGraphicSelection, 0, sizeof(priv->m_aGraphicSelection));
+priv->m_bInDragGraphicSelection = false;
+
+cairo_surface_destroy(priv->m_pHandleStart);
+priv->m_pHandleStart = 0;
+memset(&priv->m_aHandleStartRect, 0, sizeof(priv->m_aHandleStartRect));
+priv->m_bInDragStartHandle = false;
+
+cairo_surface_destroy(priv->m_pHandleMiddle);
+priv->m_pHandleMiddle = 0;
+memset(&priv->m_aHandleMiddleRect, 0, sizeof(priv->m_aHandleMiddleRect));
+priv->m_bInDragMiddleHandle = false;
+
+cairo_surface_destroy(priv->m_pHandleEnd);
+priv->m_pHandleEnd = 0;
+memset(&priv->m_aHandleEndRect, 0, sizeof(priv->m_aHandleEndRect));
+priv->m_bInDragEndHandle = false;
+
+cairo_surface_destroy(priv->m_pGraphicHandle);
+priv->m_pGraphicHandle = 0;
+memset(&priv->m_aGraphicHandleRects, 0, 
sizeof(priv->m_aGraphicHandleRects));
+memset(&priv->m_bInDragGraphicHandles, 0, 
sizeof(priv->m_bInDragGraphicHandles));
+
+priv->m_nViewId = 0;
+
 gtk_widget_queue_draw(GTK_WIDGET(pDocView));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless vcl/inc

[Caolán McNamara]

 vcl/headless/svpinst.cxx |2 +-
 vcl/inc/headless/svpinst.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f31d7fecb656d280c70b849d50a6642a28cf7225
Author: Caolán McNamara 
Date:   Tue Sep 29 12:16:38 2015 +0100

the only use of non-null pData in PostEvent is with a ImplSVEvent

Change-Id: Id843c886cc9a029f37eab53a95497707060c3ada

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 0b649ba..8a14e62 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -115,7 +115,7 @@ SvpSalInstance::~SvpSalInstance()
 osl_destroyMutex( m_aEventGuard );
 }
 
-void SvpSalInstance::PostEvent(const SalFrame* pFrame, void* pData, sal_uInt16 
nEvent)
+void SvpSalInstance::PostEvent(const SalFrame* pFrame, ImplSVEvent* pData, 
sal_uInt16 nEvent)
 {
 if( osl_acquireMutex( m_aEventGuard ) )
 {
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index f8c5d6e..0c9fa4a 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -97,7 +97,7 @@ public:
 SvpSalInstance( SalYieldMutex *pMutex );
 virtual ~SvpSalInstance();
 
-voidPostEvent( const SalFrame* pFrame, void* pData, 
sal_uInt16 nEvent );
+voidPostEvent(const SalFrame* pFrame, ImplSVEvent* 
pData, sal_uInt16 nEvent);
 
 boolPostedEventsInQueue();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New Defects reported by Coverity Scan for LibreOffice

[Caolán McNamara]

On Mon, 2015-09-28 at 12:17 -0700, scan-ad...@coverity.com wrote:

caolanm->martin:
4fd693f718ac74115ea58208ac3427c01857d260 and
d626345e8f1730eed1bb2b7183499a85133f are my primitive hacks to
address the two new warnings mentioned below from coverity in the
relatively new graphite layout code. Its probably worth having a look
here (and I've sent a coverity invite if you want to use the web-ui for
these) to see if everything is as it should be

C.

> Hi,
> 
> Please find the latest report on new defect(s) introduced to
> LibreOffice found with Coverity Scan.

> *** CID 1325060:  Error handling issues  (NEGATIVE_RETURNS)
> /vcl/source/glyphs/graphite_layout.cxx: 742 in
> GraphiteLayout::ApplyDXArray(ImplLayoutArgs &, std::vector std::allocator> &)()
> 736 for (int n = firstChar; n <= lastChar; ++n)
> 737 if (mvCharDxs[n - mnMinCharPos] != -1)
> 738 mvCharDxs[n - mnMinCharPos] += nDWidth +
> nDGlyphOrigin;
> 739 for (int n = i; n < nLastGlyph; n++)
> 740 mvGlyphs[n].maLinearPos.X() += (nDGlyphOrigin +
> nDWidth) * (bRtl ? -1 : 1);
> 741 
> > > > CID 1325060:  Error handling issues  (NEGATIVE_RETURNS)
> > > > "nBaseGlyph" is passed to a parameter that cannot be
> > > > negative. [Note: The source code implementation of the function
> > > > has been overridden by a builtin model.]
> 742 rDeltaWidth[nBaseGlyph] = nDWidth;
> 743 #ifdef GRLAYOUT_DEBUG
> 744 fprintf(grLog(),"c%d=%d g%d-%d dW%ld-%ld=%ld dX%ld
> x%ld @%d=%d\n", firstChar, lastChar, i, nLastGlyph, nNewClusterWidth,
> nOrigClusterWidth, nDWidth, nDGlyphOrigin,
> mvGlyphs[i].maLinearPos.X(), mvCharDxs[lastChar - mnMinCharPos],
> args.mpDXArray[lastChar - args.mnMinCharPos]);
> 745 #endif
> 746 i = nLastGlyph - 1;
> 747 if (i >= endGi - 1)
> 
> ** CID 1325059:(NEGATIVE_RETURNS)
> /vcl/source/glyphs/graphite_layout.cxx: 693 in
> GraphiteLayout::ApplyDXArray(ImplLayoutArgs &, std::vector std::allocator> &)()
> /vcl/source/glyphs/graphite_layout.cxx: 693 in
> GraphiteLayout::ApplyDXArray(ImplLayoutArgs &, std::vector std::allocator> &)()
> 
> 
> _
> ___
> *** CID 1325059:(NEGATIVE_RETURNS)
> /vcl/source/glyphs/graphite_layout.cxx: 693 in
> GraphiteLayout::ApplyDXArray(ImplLayoutArgs &, std::vector std::allocator> &)()
> 687 fprintf(grLog(),"ApplyDx %d-%d=%d-%d\n", startChar,
> endChar, startGi, endGi);
> 688 #endif
> 689 
> 690 for (int i = startGi; i < endGi; ++i)
> 691 {
> 692 // calculate visual cluster bounds
> > > > CID 1325059:(NEGATIVE_RETURNS)
> > > > "i" is passed to a parameter that cannot be negative.
> > > > [Note: The source code implementation of the function has been
> > > > overridden by a builtin model.]
> 693 int firstChar = mvGlyph2Char[i];
> 694 int nBaseGlyph = mvChar2BaseGlyph[firstChar -
> mnMinCharPos];
> 695 while (nBaseGlyph == -1 && i < endGi)
> 696 {
> 697 ++i;
> 698 firstChar = mvGlyph2Char[i];
> /vcl/source/glyphs/graphite_layout.cxx: 693 in
> GraphiteLayout::ApplyDXArray(ImplLayoutArgs &, std::vector std::allocator> &)()
> 687 fprintf(grLog(),"ApplyDx %d-%d=%d-%d\n", startChar,
> endChar, startGi, endGi);
> 688 #endif
> 689 
> 690 for (int i = startGi; i < endGi; ++i)
> 691 {
> 692 // calculate visual cluster bounds
> > > > CID 1325059:(NEGATIVE_RETURNS)
> > > > "i" is passed to a parameter that cannot be negative.
> > > > [Note: The source code implementation of the function has been
> > > > overridden by a builtin model.]
> 693 int firstChar = mvGlyph2Char[i];
> 694 int nBaseGlyph = mvChar2BaseGlyph[firstChar -
> mnMinCharPos];
> 695 while (nBaseGlyph == -1 && i < endGi)
> 696 {
> 697 ++i;
> 698 firstChar = mvGlyph2Char[i];

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - vcl/source

[Caolán McNamara]

 vcl/source/glyphs/graphite_layout.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit d626345e8f1730eed1bb2b7183499a85133f
Author: Caolán McNamara 
Date:   Tue Sep 29 12:09:33 2015 +0100

coverity#1325059 Argument cannot be negative bodge

Change-Id: I9bae22c7420247a26f0fe73e6c4e590471f19b0e

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 635417b..10be4a0 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -689,6 +689,12 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, 
std::vector & rDelt
 
 for (int i = startGi; i < endGi; ++i)
 {
+if (i < 0)
+{
+SAL_WARN( "vcl.gdi", "Negative index" );
+continue;
+}
+
 // calculate visual cluster bounds
 int firstChar = mvGlyph2Char[i];
 int nBaseGlyph = mvChar2BaseGlyph[firstChar - mnMinCharPos];
commit 4fd693f718ac74115ea58208ac3427c01857d260
Author: Caolán McNamara 
Date:   Tue Sep 29 12:07:20 2015 +0100

coverity#1325060 Argument cannot be negative bodge

Change-Id: Iee72d75a5609aa6e1098723ff62928bd47b42072

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 305a5d4..635417b 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -739,6 +739,12 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, 
std::vector & rDelt
 for (int n = i; n < nLastGlyph; n++)
 mvGlyphs[n].maLinearPos.X() += (nDGlyphOrigin + nDWidth) * (bRtl ? 
-1 : 1);
 
+if (nBaseGlyph < 0)
+{
+SAL_WARN( "vcl.gdi", "Negative BaseGlyph" );
+continue;
+}
+
 rDeltaWidth[nBaseGlyph] = nDWidth;
 #ifdef GRLAYOUT_DEBUG
 fprintf(grLog(),"c%d=%d g%d-%d dW%ld-%ld=%ld dX%ld x%ld @%d=%d\n", 
firstChar, lastChar, i, nLastGlyph, nNewClusterWidth, nOrigClusterWidth, 
nDWidth, nDGlyphOrigin, mvGlyphs[i].maLinearPos.X(), mvCharDxs[lastChar - 
mnMinCharPos], args.mpDXArray[lastChar - args.mnMinCharPos]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 93240] replace boost::ptr_container with std::container

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=93240

--- Comment #12 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=ce3c818e8977561e6fbf11fe62997f29ae918521

starmath: tdf#93240 replace boost::ptr_vector

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: starmath/inc starmath/source

[Takeshi Abe]

 starmath/inc/parse.hxx|5 +++--
 starmath/source/parse.cxx |   16 
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit ce3c818e8977561e6fbf11fe62997f29ae918521
Author: Takeshi Abe 
Date:   Thu Sep 24 13:12:36 2015 +0900

starmath: tdf#93240 replace boost::ptr_vector

with std::vector

Change-Id: I72f96b08273c73cbd11c7796c34a45b262325209
Reviewed-on: https://gerrit.libreoffice.org/18820
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index f44f379..0ae01ef 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -20,8 +20,9 @@
 #define INCLUDED_STARMATH_INC_PARSE_HXX
 
 #include 
+#include 
 #include 
-#include 
+#include 
 
 #include "types.hxx"
 #include "token.hxx"
@@ -33,7 +34,7 @@ class SmParser
 OUStringm_aBufferString;
 SmToken m_aCurToken;
 SmNodeStack m_aNodeStack;
-boost::ptr_vector< SmErrorDesc > m_aErrDescList;
+std::vector> m_aErrDescList;
 int m_nCurError;
 LanguageTypem_nLang;
 sal_Int32   m_nBufferIndex,
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 47ad4c6..0c0de52 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2417,7 +2417,7 @@ SmNode *SmParser::ParseExpression(const OUString &rBuffer)
 
 size_t SmParser::AddError(SmParseError Type, SmNode *pNode)
 {
-SmErrorDesc *pErrDesc = new SmErrorDesc;
+std::unique_ptr pErrDesc(new SmErrorDesc);
 
 pErrDesc->m_eType = Type;
 pErrDesc->m_pNode = pNode;
@@ -2445,7 +2445,7 @@ size_t SmParser::AddError(SmParseError Type, SmNode 
*pNode)
 }
 pErrDesc->m_aText += SM_RESSTR(nRID);
 
-m_aErrDescList.push_back( pErrDesc );
+m_aErrDescList.push_back(std::move(pErrDesc));
 
 return m_aErrDescList.size()-1;
 }
@@ -2454,11 +2454,11 @@ size_t SmParser::AddError(SmParseError Type, SmNode 
*pNode)
 const SmErrorDesc *SmParser::NextError()
 {
 if ( !m_aErrDescList.empty() )
-if (m_nCurError > 0) return &m_aErrDescList[ --m_nCurError ];
+if (m_nCurError > 0) return m_aErrDescList[ --m_nCurError ].get();
 else
 {
 m_nCurError = 0;
-return &m_aErrDescList[ m_nCurError ];
+return m_aErrDescList[ m_nCurError ].get();
 }
 else return NULL;
 }
@@ -2467,11 +2467,11 @@ const SmErrorDesc *SmParser::NextError()
 const SmErrorDesc *SmParser::PrevError()
 {
 if ( !m_aErrDescList.empty() )
-if (m_nCurError < (int) (m_aErrDescList.size() - 1)) return 
&m_aErrDescList[ ++m_nCurError ];
+if (m_nCurError < (int) (m_aErrDescList.size() - 1)) return 
m_aErrDescList[ ++m_nCurError ].get();
 else
 {
 m_nCurError = (int) (m_aErrDescList.size() - 1);
-return &m_aErrDescList[ m_nCurError ];
+return m_aErrDescList[ m_nCurError ].get();
 }
 else return NULL;
 }
@@ -2480,10 +2480,10 @@ const SmErrorDesc *SmParser::PrevError()
 const SmErrorDesc *SmParser::GetError(size_t i)
 {
 if ( i < m_aErrDescList.size() )
-return &m_aErrDescList[ i ];
+return m_aErrDescList[ i ].get();
 
 if ( (size_t)m_nCurError < m_aErrDescList.size() )
-return &m_aErrDescList[ m_nCurError ];
+return m_aErrDescList[ m_nCurError ].get();
 
 return NULL;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/firebird

[Tor Lillqvist]

 external/firebird/firebird-macosx.patch.1 |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 183129ea128c0eccdb9bc1174c4e3c8a87e78d1f
Author: Tor Lillqvist 
Date:   Wed Jun 10 10:49:57 2015 +0300

Fix Firebird build against OS X SDK 10.11

Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc
(cherry picked from commit a799d7c9a66464f33bd8ee42d535e29a976d64ae)
Reviewed-on: https://gerrit.libreoffice.org/18716
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index 0ad9bd9..42007d5 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -27,6 +27,15 @@
  
  PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target
  
+@@ -57,7 +57,7 @@
+ 
+ LINK_TRACE = $(LIB_LINK) $(LIB_BUNDLE_OPTIONS)
+ 
+-LINK_CLIENT = $(LIB_LINK) -nodefaultlibs $(LINK_FIREBIRD_CLIENT_SYMBOLS) 
$(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\
++LINK_CLIENT = $(LIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) 
$(LIB_LINK_IMPLIB)\
+  $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME)
+ 
+ ifeq (@VOID_PTR_SIZE@,8)
 diff -ur firebird.org/builds/posix/postfix.darwin 
firebird/builds/posix/postfix.darwin
 --- firebird.org/builds/posix/postfix.darwin   2013-07-12 20:55:46.0 
+0200
 +++ firebird/builds/posix/postfix.darwin   2013-07-15 12:07:36.0 
+0200
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - configure.ac external/firebird

[Tor Lillqvist]

 configure.ac  |   17 +
 external/firebird/firebird-macosx.patch.1 |9 +
 2 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 6e4dfd1b8b67aafe1a83aac3a329e6b9ff091e57
Author: Tor Lillqvist 
Date:   Tue Jun 9 00:33:38 2015 +0300

accept OS X 10.11 in configure, and fix firebird build against it

Accept also OS X 10.11

Change-Id: Ieedf4810f1e726bf11f0d0b1a203e560a0b16550
(cherry picked from commit bcd52844597640504d3a7caf5441f9f6181497c5)

Fix Firebird build against OS X SDK 10.11

Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc
(cherry picked from commit a799d7c9a66464f33bd8ee42d535e29a976d64ae)
Reviewed-on: https://gerrit.libreoffice.org/18718
Reviewed-by: Tor Lillqvist 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index c6d8e86..2acaa92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2724,7 +2724,7 @@ if test $_os = Darwin; then
 
 AC_MSG_CHECKING([what Mac OS X SDK to use])
 
-for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10; do
+for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 with_macosx_sdk="${_macosx_sdk}"
@@ -2752,8 +2752,11 @@ if test $_os = Darwin; then
 10.10)
 MACOSX_SDK_VERSION=101000
 ;;
+10.11)
+MACOSX_SDK_VERSION=101100
+;;
 *)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.8--10])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.8--11])
 ;;
 esac
 
@@ -2782,8 +2785,11 @@ if test $_os = Darwin; then
 10.10)
 MAC_OS_X_VERSION_MIN_REQUIRED="101000"
 ;;
+10.11)
+MAC_OS_X_VERSION_MIN_REQUIRED="101100"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.8--10])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.8--11])
 ;;
 esac
 
@@ -2816,8 +2822,11 @@ if test $_os = Darwin; then
 10.10)
 MAC_OS_X_VERSION_MAX_ALLOWED="101000"
 ;;
+10.11)
+MAC_OS_X_VERSION_MAX_ALLOWED="101100"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.8--10])
+AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.8--11])
 ;;
 esac
 
diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index 0ad9bd9..42007d5 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -27,6 +27,15 @@
  
  PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target
  
+@@ -57,7 +57,7 @@
+ 
+ LINK_TRACE = $(LIB_LINK) $(LIB_BUNDLE_OPTIONS)
+ 
+-LINK_CLIENT = $(LIB_LINK) -nodefaultlibs $(LINK_FIREBIRD_CLIENT_SYMBOLS) 
$(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\
++LINK_CLIENT = $(LIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) 
$(LIB_LINK_IMPLIB)\
+  $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME)
+ 
+ ifeq (@VOID_PTR_SIZE@,8)
 diff -ur firebird.org/builds/posix/postfix.darwin 
firebird/builds/posix/postfix.darwin
 --- firebird.org/builds/posix/postfix.darwin   2013-07-12 20:55:46.0 
+0200
 +++ firebird/builds/posix/postfix.darwin   2013-07-15 12:07:36.0 
+0200
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/oox oox/source

[Katarina Behrens]

 include/oox/export/drawingml.hxx |2 -
 oox/source/export/drawingml.cxx  |   40 +--
 2 files changed, 23 insertions(+), 19 deletions(-)

New commits:
commit 7e2c726fc1ca98d2a21bd75b8669e41e461ed85f
Author: Katarina Behrens 
Date:   Wed Aug 26 18:05:08 2015 +0200

tdf#91293: Preserve hyperlink on URL field OOXML export

The fix is twofold:
1.Get URL property from the underlying text field, not from the
text run -- put text field properties into rXPropSet (that's
what GETA macro later queries), not into rRun

6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 does s/rXPropSet/rRun/
afaics for no good reason

2. Retrieve string content from URL field early, so that the test
for empty text content doesn't fire

Reviewed-on: https://gerrit.libreoffice.org/18031
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

Conflicts:
oox/source/export/drawingml.cxx
sd/qa/unit/export-tests.cxx

Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0
Reviewed-on: https://gerrit.libreoffice.org/18709
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 246960c..255f493 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -107,7 +107,7 @@ protected:
 bool GetPropertyAndState( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet,
   ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertyState > rXPropState,
   const OUString& aName, 
::com::sun::star::beans::PropertyState& eState );
-const char* GetFieldType( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextRange > rRun, bool& bIsField );
+OUString GetFieldValue( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextRange > rRun, bool& bIsURLField );
 
 
 /// If bRelPathToMedia is true add "../" to image folder path while adding 
the image relationship
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 66dfb1f..efe6323 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1409,7 +1409,7 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
 Reference< XTextField > rXTextField;
 GET( rXTextField, TextField );
 if( rXTextField.is() )
-rRun.set( rXTextField, UNO_QUERY );
+rXPropSet.set( rXTextField, UNO_QUERY );
 }
 
 // field properties starts here
@@ -1432,11 +1432,10 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
 mpFS->endElementNS( XML_a, XML_rPr );
 }
 
-const char* DrawingML::GetFieldType( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextRange > rRun, bool& bIsField )
+OUString DrawingML::GetFieldValue( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextRange > rRun, bool& bIsURLField )
 {
-const char* sType = NULL;
 Reference< XPropertySet > rXPropSet( rRun, UNO_QUERY );
-OUString aFieldType;
+OUString aFieldType, aFieldValue;
 
 if( GETA( TextPortionType ) )
 {
@@ -1450,7 +1449,6 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 GET( rXTextField, TextField );
 if( rXTextField.is() )
 {
-bIsField = true;
 rXPropSet.set( rXTextField, UNO_QUERY );
 if( rXPropSet.is() )
 {
@@ -1458,17 +1456,19 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 DBG(fprintf (stderr, "field kind: %s\n", USS(aFieldKind) ));
 if( aFieldKind == "Page" )
 {
-return "slidenum";
+aFieldValue = OUString("slidenum");
+}
+else if( aFieldKind == "URL" )
+{
+bIsURLField = true;
+GET( aFieldValue, Representation)
+
 }
-// else if( aFieldKind == "URL" ) {
-// do not return here
-// and make URL field text run with hyperlink property later
-// }
 }
 }
 }
 
-return sType;
+return aFieldValue;
 }
 
 void DrawingML::GetUUID( OStringBuffer& rBuffer )
@@ -1513,10 +1513,15 @@ void DrawingML::GetUUID( OStringBuffer& rBuffer )
 
 void DrawingML::WriteRun( Reference< XTextRange > rRun )
 {
-const char* sFieldType;
-bool bIsField = false;
+bool bIsURLField = false;
+OUString sFieldValue = GetFieldValue( rRun, bIsURLField );
+bool bWriteField  = !( sFieldValue.isEmpty() || bIsURLField );
+
 OUString sText = rRun->getString();
 
+if ( bIsURLField )
+sText = sFieldValue;
+
 if( sText.isEmpty())
 {
 Reference< XPropertySet > xPropSet( rR

[Libreoffice-commits] online.git: loolwsd/protocol.txt

[Miklos Vajna]

 loolwsd/protocol.txt |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7441ffa21a212b752a8ab32e2c9bc1d2b0434091
Author: Miklos Vajna 
Date:   Tue Sep 29 12:55:21 2015 +0200

loolwsd: document partpagerectangles command on both directions

diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index 369bb69..88cc062 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -75,6 +75,9 @@ uno 
 
  is a line of text.
 
+partpagerectangles
+
+Invokes lok::Document::getPartPageRectangles().
 
 server -> client
 
@@ -117,6 +120,10 @@ status: type= parts= 
current= width=
 
 styles: {"styleFamily": ["styles in family"], etc. }
 
+partpagerectangles: 
+
+Payload format is the same as LOK_CALLBACK_TEXT_SELECTION.
+
 textselectioncontent: 
 
 Current selection's content
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - loolwsd/bundled loolwsd/LOOLSession.cpp loolwsd/LOOLSession.hpp loolwsd/Makefile.am

[Miklos Vajna]

 loolwsd/LOOLSession.cpp |   34 
 loolwsd/LOOLSession.hpp |6 ++
 loolwsd/Makefile.am |4 +
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h |   25 +--
 4 files changed, 64 insertions(+), 5 deletions(-)

New commits:
commit 80ec8a5b4f4f0e323a98a348c1e1a1ef7018dcd8
Author: Miklos Vajna 
Date:   Tue Sep 29 12:27:45 2015 +0200

loolwsd: parse the partpagerectangles command and cache the values

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 233e999..4b00dea 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -214,6 +214,10 @@ bool MasterProcessSession::handleInput(const char *buffer, 
int length)
 std::string commandName = 
object->get("commandName").toString();
 peer->_tileCache->saveTextFile(std::string(buffer, length), 
"cmdValues" + commandName + ".txt");
 }
+else if (tokens[0] == "partpagerectangles:")
+{
+peer->_tileCache->saveTextFile(std::string(buffer, length), 
"partpagerectangles.txt");
+}
 else if (tokens[0] == "invalidatetiles:")
 {
 // FIXME temporarily, set the editing on the 1st invalidate, 
TODO extend
@@ -283,6 +287,7 @@ bool MasterProcessSession::handleInput(const char *buffer, 
int length)
 }
 else if (tokens[0] != "canceltiles" &&
  tokens[0] != "commandvalues" &&
+ tokens[0] != "partpagerectangles" &&
  tokens[0] != "gettextselection" &&
  tokens[0] != "invalidatetiles" &&
  tokens[0] != "key" &&
@@ -315,6 +320,10 @@ bool MasterProcessSession::handleInput(const char *buffer, 
int length)
 {
 return getCommandValues(buffer, length, tokens);
 }
+else if (tokens[0] == "partpagerectangles")
+{
+return getPartPageRectangles(buffer, length);
+}
 else if (tokens[0] == "invalidatetiles")
 {
 return invalidateTiles(buffer, length, tokens);
@@ -454,6 +463,21 @@ bool MasterProcessSession::getCommandValues(const char 
*buffer, int length, Stri
 return true;
 }
 
+bool MasterProcessSession::getPartPageRectangles(const char *buffer, int 
length)
+{
+std::string partPageRectangles = 
_tileCache->getTextFile("partpagerectangles.txt");
+if (partPageRectangles.size() > 0)
+{
+sendTextFrame(partPageRectangles);
+return true;
+}
+
+if (_peer.expired())
+dispatchChild();
+forwardToPeer(buffer, length);
+return true;
+}
+
 void MasterProcessSession::sendTile(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 int part, width, height, tilePosX, tilePosY, tileWidth, tileHeight;
@@ -633,6 +657,10 @@ bool ChildProcessSession::handleInput(const char *buffer, 
int length)
 {
 return getCommandValues(buffer, length, tokens);
 }
+if (tokens[0] == "partpagerectangles")
+{
+return getPartPageRectangles(buffer, length);
+}
 if (tokens[0] == "load")
 {
 if (_docURL != "")
@@ -895,6 +923,12 @@ bool ChildProcessSession::getCommandValues(const char 
*buffer, int length, Strin
 return true;
 }
 
+bool ChildProcessSession::getPartPageRectangles(const char* /*buffer*/, int 
/*length*/)
+{
+sendTextFrame("partpagerectangles: " + 
std::string(_loKitDocument->pClass->getPartPageRectangles(_loKitDocument)));
+return true;
+}
+
 void ChildProcessSession::sendTile(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 int part, width, height, tilePosX, tilePosY, tileWidth, tileHeight;
diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index 247012c..13970c6 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -47,6 +47,8 @@ public:
 
 virtual bool getCommandValues(const char *buffer, int length, 
Poco::StringTokenizer& tokens) = 0;
 
+virtual bool getPartPageRectangles(const char *buffer, int length) = 0;
+
 virtual bool handleInput(const char *buffer, int length) = 0;
 
 protected:
@@ -113,6 +115,8 @@ public:
 
 virtual bool getCommandValues(const char *buffer, int length, 
Poco::StringTokenizer& tokens);
 
+virtual bool getPartPageRectangles(const char *buffer, int length) 
override;
+
  protected:
 bool invalidateTiles(const char *buffer, int length, 
Poco::StringTokenizer& tokens);
 
@@ -161,6 +165,8 @@ public:
 
 virtual bool getCommandValues(const char *buffer, int length, 
Poco::StringTokenizer& tokens);
 
+virtual bool getPartPageRectangles(const char *buffer, int length) 
override;
+
 LibreOfficeKitDocument *_loKitDocument;
 std::string _docType;
 
commit 5d5d41d6198f7b30839a5534dcfea7f6bb1f9006
Author: Miklos Vajna 
Date:   Tue Sep 29 12:27:27 2015 +0200

loolwsd: update bundled LOK headers

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/loolwsd/bundled/i

[Libreoffice-commits] core.git: Branch 'feature/fixes10' - vcl/source

[Tomaž Vajngerl]

 vcl/source/gdi/virdev.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 969c908b800cae61055a20739dccf84025739614
Author: Tomaž Vajngerl 
Date:   Mon Sep 28 12:51:02 2015 +0200

don't allocate (by eraseing) an un-initialized 1x1 virtual device

Change-Id: I11c7063d7ac689866461ceabf8648f1c3c7bb17d
(cherry picked from commit d76c5aa78f0b9004c6719dcc4d2be052c0703ba5)

diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 04ac2d7..b24378d 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -129,6 +129,8 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* 
pOutDev,
 {
 SAL_INFO( "vcl.virdev", "ImplInitVirDev(" << nDX << "," << nDY << "," << 
nBitCount << ")" );
 
+bool bErase = nDX > 0 && nDY > 0;
+
 if ( nDX < 1 )
 nDX = 1;
 
@@ -191,7 +193,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* 
pOutDev,
 SetBackground( Wallpaper( Color( COL_WHITE ) ) );
 
 // #i59283# don't erase user-provided surface
-if( !pData )
+if( !pData && bErase)
 Erase();
 
 // register VirDev in the list
@@ -212,7 +214,7 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount )
  "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for 
BitCount, not " << nBitCount );
 SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" 
);
 
-ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount );
+ImplInitVirDev( Application::GetDefaultDevice(), 0, 0, nBitCount );
 }
 
 VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 
nBitCount )
@@ -223,7 +225,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, 
sal_uInt16 nBitCount
  "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for 
BitCount, not " << nBitCount );
 SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" 
);
 
-ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
+ImplInitVirDev( &rCompDev, 0, 0, nBitCount );
 }
 
 VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 
nBitCount, sal_uInt16 nAlphaBitCount )
@@ -235,7 +237,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, 
sal_uInt16 nBitCount
 SAL_INFO( "vcl.gdi",
 "VirtualDevice::VirtualDevice( " << nBitCount << ", " << 
nAlphaBitCount << " )" );
 
-ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
+ImplInitVirDev( &rCompDev, 0, 0, nBitCount );
 
 // Enable alpha channel
 mnAlphaDepth = sal::static_int_cast(nAlphaBitCount);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc

[Caolán McNamara]

 vcl/inc/win/salframe.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ccdf49ab240ca263f43b75bfd856d1a28ee6f61d
Author: Caolán McNamara 
Date:   Tue Sep 29 11:33:49 2015 +0100

missing a PostEvent apparently

Change-Id: I54c39d23007d079fc9fdedf68c81c7eba64baea0

diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 1fc3be0..19819bd 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -89,7 +89,7 @@ public:
 
 virtual SalGraphics*AcquireGraphics() SAL_OVERRIDE;
 virtual voidReleaseGraphics( SalGraphics* pGraphics ) 
SAL_OVERRIDE;
-virtual boolPostEvent( void* pData ) SAL_OVERRIDE;
+virtual boolPostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
 virtual voidSetTitle( const OUString& rTitle ) 
SAL_OVERRIDE;
 virtual voidSetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
 virtual voidSetMenu( SalMenu* pSalMenu ) SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Contribution to LibreOffice project‏‏

[Caolán McNamara]

On Mon, 2015-09-28 at 09:46 +, Anis Tello wrote:
> Would you please explain to us the project, what are the needs and 
> the parts of the project that you would like us to write the tests 
> for?

Like Markus suggests, dig for bugs that got fixed but didn't get a
matching test case added.

Another place to look at is i18npool/source/breakiterator/data/README
There I have a list of commits which customized our break-iterator
rules, mostly with matching bug ids, which are split into those thatwe
have added tests for and those we haven't. The goal there is to try and
unwind years of customization of those rules to find out if the updated
unicode rules have made those customization redundant or if we still
need to carry those customization around.

C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Stephan Bergmann]

 vcl/source/outdev/transparent.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit bf89e877e28f5247f97226bdf93526e6a14f181f
Author: Stephan Bergmann 
Date:   Tue Sep 29 12:23:56 2015 +0200

-Werror,-Wunused-variable

Change-Id: Ice39e95596c5fcd9b3b728ef0064161898f27fb5

diff --git a/vcl/source/outdev/transparent.cxx 
b/vcl/source/outdev/transparent.cxx
index 4070216..5e4da2f 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -461,7 +461,6 @@ void OutputDevice::EmulateDrawTransparent ( const 
tools::PolyPolygon& rPolyPoly,
 {
 BitmapColor aPixCol;
 const BitmapColor aFillCol( GetFillColor() );
-const BitmapColor aWhite( pR->GetBestMatchingColor( 
Color( COL_WHITE ) ) );
 const BitmapColor aBlack( pR->GetBestMatchingColor( 
Color( COL_BLACK ) ) );
 const long nWidth = pW->Width();
 const long nHeight = pW->Height();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/dom/Draggable.js|   12 
 loleaflet/src/map/handler/Map.Drag.js |1 +
 2 files changed, 13 insertions(+)

New commits:
commit 0ee3c64dd860ba26f7d7587b1a5726f7fcaa092f
Author: Mihai Varga 
Date:   Tue Sep 29 13:12:30 2015 +0300

loleaflet: don't pan horiz/vertic when doc fits viewing area

diff --git a/loleaflet/src/dom/Draggable.js b/loleaflet/src/dom/Draggable.js
index 2263074..3df1342 100644
--- a/loleaflet/src/dom/Draggable.js
+++ b/loleaflet/src/dom/Draggable.js
@@ -83,6 +83,18 @@ L.Draggable = L.Evented.extend({
newPoint = new L.Point(first.clientX, first.clientY),
offset = newPoint.subtract(this._startPoint);
 
+   if (this._map) {
+   if (this._map.getDocSize().x < this._map.getSize().x) {
+   // don't pan horizontaly when the document fits 
in the viewing
+   // area horizontally (docWidth < viewAreaWidth)
+   offset.x = 0;
+   }
+   if (this._map.getDocSize().y < this._map.getSize().y) {
+   // don't pan vertically when the document fits 
in the viewing
+   // area horizontally (docHeight < 
viewAreaHeight)
+   offset.y = 0;
+   }
+   }
if (!offset.x && !offset.y) { return; }
if (L.Browser.touch && Math.abs(offset.x) + Math.abs(offset.y) 
< 3) { return; }
 
diff --git a/loleaflet/src/map/handler/Map.Drag.js 
b/loleaflet/src/map/handler/Map.Drag.js
index 62ec332..10b3b4a 100644
--- a/loleaflet/src/map/handler/Map.Drag.js
+++ b/loleaflet/src/map/handler/Map.Drag.js
@@ -20,6 +20,7 @@ L.Map.Drag = L.Handler.extend({
var map = this._map;
 
this._draggable = new L.Draggable(map._mapPane, 
map._container);
+   this._draggable._map = map;
 
this._draggable.on({
down: this._onDown,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/unx vcl/win

[Caolán McNamara]

 vcl/headless/svpframe.cxx   |2 +-
 vcl/headless/svpinst.cxx|2 +-
 vcl/inc/headless/svpframe.hxx   |2 +-
 vcl/inc/osx/salframe.h  |2 +-
 vcl/inc/salframe.hxx|3 ++-
 vcl/inc/unx/gtk/gtkframe.hxx|2 +-
 vcl/inc/unx/salframe.h  |2 +-
 vcl/osx/salframe.cxx|2 +-
 vcl/unx/generic/window/salframe.cxx |2 +-
 vcl/unx/gtk/window/gtksalframe.cxx  |2 +-
 vcl/win/source/window/salframe.cxx  |2 +-
 11 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 1b4994065ec50b2ef7a38f26b95b8543b4ff640d
Author: Caolán McNamara 
Date:   Mon Sep 28 20:43:31 2015 +0100

retain type for another level

Change-Id: I4017e5404c99d37b36988f1d7a8ce17e42010070
Reviewed-on: https://gerrit.libreoffice.org/18913
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 459a710..f019ea5 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -191,7 +191,7 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
 delete pSvpGraphics;
 }
 
-bool SvpSalFrame::PostEvent( void* pData )
+bool SvpSalFrame::PostEvent(ImplSVEvent* pData)
 {
 m_pInstance->PostEvent( this, pData, SALEVENT_USEREVENT );
 return true;
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 17d98b0..0b649ba 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -115,7 +115,7 @@ SvpSalInstance::~SvpSalInstance()
 osl_destroyMutex( m_aEventGuard );
 }
 
-void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, 
sal_uInt16 nEvent )
+void SvpSalInstance::PostEvent(const SalFrame* pFrame, void* pData, sal_uInt16 
nEvent)
 {
 if( osl_acquireMutex( m_aEventGuard ) )
 {
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 0598bf0..23edc62 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -81,7 +81,7 @@ public:
 virtual SalGraphics*AcquireGraphics() SAL_OVERRIDE;
 virtual voidReleaseGraphics( SalGraphics* pGraphics ) 
SAL_OVERRIDE;
 
-virtual boolPostEvent( void* pData ) SAL_OVERRIDE;
+virtual boolPostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
 
 virtual voidSetTitle( const OUString& rTitle ) 
SAL_OVERRIDE;
 virtual voidSetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 69ff3a1..f426200 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -108,7 +108,7 @@ public:
 
 virtual SalGraphics*AcquireGraphics() SAL_OVERRIDE;
 virtual voidReleaseGraphics( SalGraphics* pGraphics ) 
SAL_OVERRIDE;
-virtual boolPostEvent( void* pData ) SAL_OVERRIDE;
+virtual boolPostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
 virtual voidSetTitle( const OUString& rTitle ) 
SAL_OVERRIDE;
 virtual voidSetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
 virtual voidSetRepresentedURL( const OUString& ) 
SAL_OVERRIDE;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index e75ed2d..26d275b 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -95,6 +95,7 @@ typedef sal_uInt64 SalExtStyle;
 #define SAL_FRAME_POSSIZE_HEIGHT((sal_uInt16)0x0008)
 
 struct SystemParentData;
+struct ImplSVEvent;
 
 /// A SalFrame is a system window (e.g. an X11 window).
 class VCL_PLUGIN_PUBLIC SalFrame
@@ -126,7 +127,7 @@ public:
 
 // Event must be destroyed, when Frame is destroyed
 // When Event is called, SalInstance::Yield() must be returned
-virtual boolPostEvent( void* pData ) = 0;
+virtual boolPostEvent(ImplSVEvent* pData) = 0;
 
 virtual voidSetTitle( const OUString& rTitle ) = 0;
 virtual voidSetIcon( sal_uInt16 nIcon ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 411207b..dcf7f2f 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -374,7 +374,7 @@ public:
 
 // Event must be destroyed, when Frame is destroyed
 // When Event is called, SalInstance::Yield() must be returned
-virtual boolPostEvent( void* pData ) SAL_OVERRIDE;
+virtual boolPostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
 
 virtual voidSetTitle( const OUString& rTitle ) 
SAL_OVERRIDE;
 virtual voidSetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 08be500..d062791 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -215,7 +215,7 @@ public:
 // call with false to setup graphics with window (GetWindow())
 virtual voidupdateGraphics( bool

[Libreoffice-commits] core.git: 28 commits - chart2/source editeng/source filter/source include/editeng include/vcl sc/source svx/source sw/source tools/source vcl/source vcl/unx

[Caolán McNamara]

 chart2/source/view/main/3DChartObjects.cxx  |2 -
 editeng/source/outliner/outliner.cxx|1 
 editeng/source/outliner/overflowingtxt.cxx  |   16 
 filter/source/graphicfilter/ipict/ipict.cxx |   32 ++---
 include/editeng/overflowingtxt.hxx  |2 -
 include/vcl/salbtype.hxx|7 -
 sc/source/ui/view/editsh.cxx|2 -
 svx/source/svdraw/svdedxv.cxx   |   35 +---
 svx/source/svdraw/svdotxed.cxx  |   13 --
 svx/source/svdraw/textchainflow.cxx |   11 ++--
 svx/source/xoutdev/_xoutbmp.cxx |6 +++-
 svx/source/xoutdev/xattrbmp.cxx |8 --
 sw/source/core/doc/tblrwcl.cxx  |2 -
 sw/source/core/layout/trvlfrm.cxx   |2 -
 tools/source/inet/inetmime.cxx  |   29 ---
 vcl/source/filter/wmf/winwmf.cxx|7 -
 vcl/source/gdi/bitmap3.cxx  |9 ---
 vcl/source/gdi/dibtools.cxx |   17 -
 vcl/unx/generic/gdi/salbmp.cxx  |6 ++--
 19 files changed, 107 insertions(+), 100 deletions(-)

New commits:
commit 97a2ca5d689612a44a93cc7932eb2e7e46be4a68
Author: Caolán McNamara 
Date:   Tue Sep 29 10:39:54 2015 +0100

coverity#1242658 Untrusted loop bound

Change-Id: I0a279e47a4d87f561f39d5a8ca65fa17e2bc4a65

diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index 5caa437..d926079 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -84,16 +84,15 @@ namespace PictReaderInternal {
   };
 
   sal_uLong Pattern::read(SvStream &stream) {
-short nx,ny;
 unsigned char nbyte[8];
 sal_uLong nHiBytes, nLoBytes;
 isColor = false;
 
 // count the no of bits in pattern which are set to 1:
 nBitCount=0;
-for (ny=0; ny<8; ny++) {
+for (short ny=0; ny<8; ny++) {
   stream.ReadChar( reinterpret_cast(nbyte[ny]) );
-  for (nx=0; nx<8; nx++) {
+  for (short nx=0; nx<8; nx++) {
 if ( (nbyte[ny] & (1< nDestBPL )
 BITMAPERROR;
 
-for ( ny = 0; ny < nHeight; ny++ )
+if ( nRowBytes < 8 || nPackType == 1 ) {
+if (pPict->remainingSize() < sizeof(sal_uInt8) * nHeight * 
nRowBytes)
+BITMAPERROR;
+}
+
+for (sal_uInt16 ny = 0; ny < nHeight; ++ny)
 {
-nx = 0;
+sal_uInt16 nx = 0;
 if ( nRowBytes < 8 || nPackType == 1 )
 {
 for ( i = 0; i < nRowBytes; i++ )
@@ -908,9 +912,9 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool 
bBaseAddr, bool bColo
 BITMAPERROR;
 }
 
-for ( ny = 0; ny < nHeight; ny++ )
+for (sal_uInt16 ny = 0; ny < nHeight; ++ny)
 {
-nx = 0;
+sal_uInt16 nx = 0;
 if ( nRowBytes < 8 || nPackType == 1 )
 {
 for ( i = 0; i < nWidth; i++ )
@@ -1005,9 +1009,9 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, 
bool bBaseAddr, bool bColo
 if (nWidth > nMaxCols)
 BITMAPERROR;
 
-for ( ny = 0; ny < nHeight; ny++ )
+for (sal_uInt16 ny = 0; ny < nHeight; ++ny)
 {
-for ( nx = 0; nx < nWidth; nx++ )
+for (sal_uInt16 nx = 0; nx < nWidth; ++nx)
 {
 pPict->ReadUChar( nDummy ).ReadUChar( nRed ).ReadUChar( 
nGreen ).ReadUChar( nBlue );
 pAcc->SetPixel( ny, nx, BitmapColor( nRed, nGreen, nBlue) 
);
@@ -1025,9 +1029,9 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, 
bool bBaseAddr, bool bColo
 if (nWidth > nMaxCols)
 BITMAPERROR;
 
-for ( ny = 0; ny < nHeight; ny++ )
+for (sal_uInt16 ny = 0; ny < nHeight; ++ny)
 {
-for ( nx = 0; nx < nWidth; nx++ )
+for (sal_uInt16 nx = 0; nx < nWidth; ++nx)
 {
 pPict->ReadUChar( nRed ).ReadUChar( nGreen ).ReadUChar( 
nBlue );
 pAcc->SetPixel( ny, nx, BitmapColor( nRed, nGreen, nBlue ) 
);
@@ -1040,7 +1044,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, 
bool bBaseAddr, bool bColo
 if ( ( nCmpCount == 3 ) || ( nCmpCount == 4 ) )
 {
 std::unique_ptr pScanline(new 
sal_uInt8[static_cast(nWidth) * nCmpCount]);
-for ( ny = 0; ny < nHeight; ny++ )
+for (sal_uInt16 ny = 0; ny < nHeight; ++ny)
 {
 nSrcBitsPos = pPict->Tell();
 if ( nRowBytes > 250 )
@@ -1086,7 +1090,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, 
bool bBaseAddr, bool bColo
 sal_uInt8* pTmp = pScanline.get();
 if ( n

[Libreoffice-commits] core.git: framework/source include/vcl vcl/source

[Jan Holesovsky]

 framework/source/layoutmanager/layoutmanager.cxx |   10 +-
 include/vcl/menu.hxx |3 +--
 include/vcl/syswin.hxx   |2 +-
 vcl/source/window/menu.cxx   |2 +-
 vcl/source/window/syswin.cxx |7 +--
 5 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit e124cd5213750b89e8a6a03dffc43172bc5402a6
Author: Jan Holesovsky 
Date:   Tue Sep 29 10:22:03 2015 +0200

XFrame parameter to SetMenuBar() is actually never used.

Change-Id: I9413f575c0964d6cbf8a32d0b85c9f2c686bb8fc

diff --git a/framework/source/layoutmanager/layoutmanager.cxx 
b/framework/source/layoutmanager/layoutmanager.cxx
index 4b4b645..a662ce8 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -782,7 +782,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( 
bool bSetVisible )
 if ( pSysWindow )
 {
 if ( bSetVisible )
-pSysWindow->SetMenuBar(pMenuBar, m_xFrame);
+pSysWindow->SetMenuBar(pMenuBar);
 else
 pSysWindow->SetMenuBar( 0 );
 }
@@ -1166,7 +1166,7 @@ throw (uno::RuntimeException, std::exception)
 
 SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow 
);
 if ( pSysWindow )
-pSysWindow->SetMenuBar(pMenuBar, m_xFrame);
+pSysWindow->SetMenuBar(pMenuBar);
 
 m_bInplaceMenuSet = true;
 m_xInplaceMenuBar = Reference< XComponent >( 
static_cast(m_pInplaceMenuBar), UNO_QUERY );
@@ -1193,7 +1193,7 @@ throw (uno::RuntimeException)
 if ( pSysWindow )
 {
 if ( pMenuBarWrapper )
-pSysWindow->SetMenuBar(static_cast(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar()), m_xFrame);
+pSysWindow->SetMenuBar(static_cast(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar()));
 else
 pSysWindow->SetMenuBar(0);
 }
@@ -1494,7 +1494,7 @@ throw (RuntimeException, std::exception)
 MenuBar* pMenuBar = 
static_cast(pAwtMenuBar->GetMenu());
 if ( pMenuBar )
 {
-pSysWindow->SetMenuBar(pMenuBar, m_xFrame);
+pSysWindow->SetMenuBar(pMenuBar);
 pMenuBar->SetDisplayable( m_bMenuVisible );
 if ( m_bMenuVisible )
 bNotify = true;
@@ -2580,7 +2580,7 @@ bool LayoutManager::implts_resetMenuBar()
 SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow );
 if ( pSysWindow && bMenuVisible && pSetMenuBar )
 {
-pSysWindow->SetMenuBar(pSetMenuBar, m_xFrame);
+pSysWindow->SetMenuBar(pSetMenuBar);
 pSetMenuBar->SetDisplayable( true );
 return true;
 }
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 160ef8b..b61c4a8 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -423,8 +423,7 @@ class VCL_DLLPUBLIC MenuBar : public Menu
 friend class MenuFloatingWindow;
 friend class SystemWindow;
 
-SAL_DLLPRIVATE static vcl::Window* ImplCreate(vcl::Window* pParent, 
vcl::Window* pWindow,
-  MenuBar* pMenu, const 
css::uno::Reference &rFrame);
+SAL_DLLPRIVATE static vcl::Window* ImplCreate(vcl::Window* pParent, 
vcl::Window* pWindow, MenuBar* pMenu);
 SAL_DLLPRIVATE static void ImplDestroy(MenuBar* pMenu, bool bDelete);
 SAL_DLLPRIVATE bool ImplHandleKeyEvent(const KeyEvent& rKEvent, bool 
bFromMenu = true);
 SAL_DLLPRIVATE bool ImplHandleCmdEvent(const CommandEvent& rCEvent);
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 78de8c9..fe4eaf4 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -233,7 +233,7 @@ public:
 voidSetWindowState(const OString& rStr);
 OString GetWindowState(sal_uInt32 nMask = WINDOWSTATE_MASK_ALL) 
const;
 
-voidSetMenuBar(MenuBar* pMenuBar, const 
css::uno::Reference& rFrame = 
css::uno::Reference());
+voidSetMenuBar(MenuBar* pMenuBar);
 MenuBar*GetMenuBar() const { return mpMenuBar; }
 voidSetMenuBarMode( MenuBarMode nMode );
 
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 23f857a..2505afa 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2549,7 +2549,7 @@ void MenuBar::SetDisplayable( bool bDisplayable )
 }
 }
 
-vcl::Window* MenuBar::ImplCreate(vcl::Window* pParent, vcl::Window* pWindow, 
MenuBar* pMenu, const css::uno::Reference &/*rFrame*/)
+vcl::Window* MenuBar::ImplCreate(vcl::Window* pParent, vcl::Window* pWindow, 
MenuBar* pMenu)
 {
 MenuBarWindow *pMenuBarWin

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/map/handler/Map.Keyboard.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b3b16d6e1c0fcf27863deb6e8a9bf923d56077e
Author: Mihai Varga 
Date:   Tue Sep 29 12:21:34 2015 +0300

loleaflet: fix undefined variable

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index e54fbb0..360d797 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -179,6 +179,7 @@ L.Map.Keyboard = L.Handler.extend({
},
 
_onKeyDown: function (e) {
+   var docLayer = this._map._docLayer;
if (e.originalEvent.ctrlKey) {
// we prepare for a copy event
docLayer._textArea.value = 'dummy text';
@@ -187,7 +188,6 @@ L.Map.Keyboard = L.Handler.extend({
return;
}
 
-   var docLayer = this._map._docLayer;
var charCode = e.originalEvent.charCode;
var keyCode = e.originalEvent.keyCode;
var unoKeyCode = this._toUNOKeyCode(keyCode);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/qa desktop/source include/LibreOfficeKit include/vcl sw/inc sw/source

[Miklos Vajna]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   25 +
 desktop/source/lib/init.cxx |   19 +++
 include/LibreOfficeKit/LibreOfficeKit.h |3 +++
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   14 ++
 include/vcl/ITiledRenderable.hxx|8 
 sw/inc/crsrsh.hxx   |2 ++
 sw/inc/unotxdoc.hxx |2 ++
 sw/source/core/crsr/crsrsh.cxx  |   14 ++
 sw/source/uibase/uno/unotxdoc.cxx   |   11 +++
 9 files changed, 98 insertions(+)

New commits:
commit d355207b45755cfe1eef0147bc25ead931741684
Author: Miklos Vajna 
Date:   Tue Sep 29 10:47:31 2015 +0200

lok: add Document::getPartPageRectangles()

Change-Id: I20acd44f7a81471982ba96ad3894a9124e035c5f

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index d7b9347..a7696d8 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -52,12 +52,14 @@ public:
 void testGetFonts();
 void testCreateView();
 void testGetFilterTypes();
+void testGetPartPageRectangles();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
 CPPUNIT_TEST(testGetStyles);
 CPPUNIT_TEST(testGetFonts);
 CPPUNIT_TEST(testCreateView);
 CPPUNIT_TEST(testGetFilterTypes);
+CPPUNIT_TEST(testGetPartPageRectangles);
 CPPUNIT_TEST_SUITE_END();
 
 uno::Reference mxComponent;
@@ -152,6 +154,29 @@ void DesktopLOKTest::testCreateView()
 closeDoc();
 }
 
+void DesktopLOKTest::testGetPartPageRectangles()
+{
+// Test that we get as many page rectangles as expected: blank document is
+// one page.
+LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+char* pRectangles = pDocument->pClass->getPartPageRectangles(pDocument);
+OUString sRectangles = OUString::fromUtf8(pRectangles);
+
+std::vector aRectangles;
+sal_Int32 nIndex = 0;
+do
+{
+OUString aRectangle = sRectangles.getToken(0, ';', nIndex);
+if (!aRectangle.isEmpty())
+aRectangles.push_back(aRectangle);
+}
+while (nIndex >= 0);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aRectangles.size());
+
+free(pRectangles);
+closeDoc();
+}
+
 void DesktopLOKTest::testGetFilterTypes()
 {
 LibLibreOffice_Impl aOffice;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b581bca..509983c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -204,6 +204,7 @@ static void doc_destroy(LibreOfficeKitDocument* pThis);
 static int  doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const 
char* pFormat, const char* pFilterOptions);
 static int doc_getDocumentType(LibreOfficeKitDocument* pThis);
 static int doc_getParts(LibreOfficeKitDocument* pThis);
+static char* doc_getPartPageRectangles(LibreOfficeKitDocument* pThis);
 static int doc_getPart(LibreOfficeKitDocument* pThis);
 static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart);
 static char* doc_getPartName(LibreOfficeKitDocument* pThis, int nPart);
@@ -266,6 +267,7 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
saveAs = doc_saveAs;
 m_pDocumentClass->getDocumentType = doc_getDocumentType;
 m_pDocumentClass->getParts = doc_getParts;
+m_pDocumentClass->getPartPageRectangles = doc_getPartPageRectangles;
 m_pDocumentClass->getPart = doc_getPart;
 m_pDocumentClass->setPart = doc_setPart;
 m_pDocumentClass->getPartName = doc_getPartName;
@@ -659,6 +661,23 @@ static void doc_setPart(LibreOfficeKitDocument* pThis, int 
nPart)
 pDoc->setPart( nPart );
 }
 
+static char* doc_getPartPageRectangles(LibreOfficeKitDocument* pThis)
+{
+ITiledRenderable* pDoc = getTiledRenderable(pThis);
+if (!pDoc)
+{
+gImpl->maLastExceptionMsg = "Document doesn't support tiled rendering";
+return 0;
+}
+
+OUString sRectangles = pDoc->getPartPageRectangles();
+OString aString = OUStringToOString(sRectangles, RTL_TEXTENCODING_UTF8);
+char* pMemory = static_cast(malloc(aString.getLength() + 1));
+strcpy(pMemory, aString.getStr());
+return pMemory;
+
+}
+
 static char* doc_getPartName(LibreOfficeKitDocument* pThis, int nPart)
 {
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index d5094bd..d83dd49 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -85,6 +85,9 @@ struct _LibreOfficeKitDocumentClass
 /// @see lok::Document::getParts().
 int (*getParts) (LibreOfficeKitDocument* pThis);
 
+/// @see lok::Document::getPartPageRectangles().
+char* (*getPartPageRectangles) (LibreOfficeKitDocument* pThis);
+
 /// @see lok::Document::getPart().
 int (*getPart) (LibreOfficeKitDocument* pTh

[Libreoffice-commits] core.git: sc/inc sc/source

[Tor Lillqvist]

 sc/inc/types.hxx|1 -
 sc/source/core/data/formulacell.cxx |3 ---
 2 files changed, 4 deletions(-)

New commits:
commit 264c6e4c522d828e7f3f6ac106763278f30c7e9b
Author: Tor Lillqvist 
Date:   Tue Sep 29 11:24:15 2015 +0300

Bin code that died in f2b93f2e314215d6342e0bd5727e6740cc15e29c

Change-Id: Ib2df51589726c0163b8cbb5434c9017d358abc78

diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 77934f0..ed944b0 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -78,7 +78,6 @@ enum GroupCalcState
 enum OpenCLKernelState
 {
 OpenCLKernelNone = 0,
-OpenCLKernelCompilationScheduled,
 OpenCLKernelBinaryCreated
 };
 
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index cb3764b..6be8b2e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2426,9 +2426,6 @@ bool ScFormulaCell::IsMultilineResult()
 
 bool ScFormulaCell::NeedsInterpret() const
 {
-if (mxGroup && mxGroup->meKernelState == 
sc::OpenCLKernelCompilationScheduled)
-return false;
-
 if (!IsDirtyOrInTableOpDirty())
 return false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 48/cb20bb5c32f076f295c7490d6ba9ac96e85ed0

[Caolán McNamara]

 48/cb20bb5c32f076f295c7490d6ba9ac96e85ed0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 70b54d5d77e13e598aea531bf68ab617c0ce37fa
Author: Caolán McNamara 
Date:   Tue Sep 29 09:03:38 2015 +0100

Notes added by 'git notes add'

diff --git a/48/cb20bb5c32f076f295c7490d6ba9ac96e85ed0 
b/48/cb20bb5c32f076f295c7490d6ba9ac96e85ed0
new file mode 100644
index 000..d4417c4
--- /dev/null
+++ b/48/cb20bb5c32f076f295c7490d6ba9ac96e85ed0
@@ -0,0 +1 @@
+merged as: 55b0da55dbd4e811bd8c1c1f9b2fab33ad540c32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: formula/source

[Kay Schenk]

 formula/source/ui/dlg/funcpage.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 55b0da55dbd4e811bd8c1c1f9b2fab33ad540c32
Author: Kay Schenk 
Date:   Tue Sep 29 01:23:47 2015 +

i#126557# increase number of lines of dropdown of category listbox

(cherry picked from commit 48cb20bb5c32f076f295c7490d6ba9ac96e85ed0)

Change-Id: I18ba8a781e111fd7706de1eadb41c93a78e27c62

diff --git a/formula/source/ui/dlg/funcpage.cxx 
b/formula/source/ui/dlg/funcpage.cxx
index 7a25404..60a7f30 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -82,6 +82,7 @@ FuncPage::FuncPage(vcl::Window* pParent,const 
IFunctionManager* _pFunctionManage
 
m_pLbCategory->SetEntryData(m_pLbCategory->InsertEntry(pCategory->getName()),const_cast(pCategory));
 }
 
+m_pLbCategory->SetDropDownLineCount(m_pLbCategory->GetEntryCount());
 m_pLbCategory->SelectEntryPos(1);
 UpdateFunctionList();
 m_pLbCategory->SetSelectHdl( LINK( this, FuncPage, SelHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.3-11'

[Andras Timar]

Tag 'cp-4.3-11' created by Andras Timar  at 
2015-09-29 08:57 -0700

cp-4.3-11

Changes since cp-4.3-8:
Andras Timar (1):
  Updated pt_PT dictionary to version 15.7.4.1

---
 pt_PT/description.xml |2 +-
 pt_PT/pt_PT.dic   |   22 ++
 2 files changed, 19 insertions(+), 5 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.3-11'

[Andras Timar]

Tag 'cp-4.3-11' created by Andras Timar  at 
2015-09-29 08:57 -0700

cp-4.3-11

Changes since cp-4.3-5-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.3-11'

[Andras Timar]

Tag 'cp-4.3-11' created by Andras Timar  at 
2015-09-29 08:57 -0700

cp-4.3-11

Changes since cp-4.3-8:
Andras Timar (1):
  tdf#86301 fix hids of startcenter

---
 source/text/shared/guide/startcenter.xhp |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.3-11'

[Andras Timar]

Tag 'cp-4.3-11' created by Andras Timar  at 
2015-09-29 08:57 -0700

cp-4.3-11

Changes since cp-4.3-10-44:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svl/source sw/source xmloff/source

[Miklos Vajna]

 svl/source/items/stylepool.cxx |2 +-
 sw/source/core/SwNumberTree/SwNodeNum.cxx  |4 ++--
 sw/source/core/SwNumberTree/SwNumberTree.cxx   |6 
+++---
 sw/source/core/access/accpara.cxx  |2 +-
 sw/source/core/doc/DocumentContentOperationsManager.cxx|2 +-
 sw/source/core/doc/DocumentListsManager.cxx|   10 
+-
 sw/source/core/doc/docdraw.cxx |2 +-
 sw/source/core/doc/docfmt.cxx  |2 +-
 sw/source/core/doc/docnum.cxx  |6 
+++---
 sw/source/core/doc/number.cxx  |6 
+++---
 sw/source/core/docnode/ndnum.cxx   |2 +-
 sw/source/core/draw/dcontact.cxx   |2 +-
 sw/source/core/edit/edattr.cxx |2 +-
 sw/source/core/fields/chpfld.cxx   |2 +-
 sw/source/core/fields/expfld.cxx   |2 +-
 sw/source/core/fields/reffld.cxx   |4 ++--
 sw/source/core/frmedt/feshview.cxx |2 +-
 sw/source/core/frmedt/fews.cxx |6 
+++---
 sw/source/core/layout/anchoreddrawobject.cxx   |2 +-
 sw/source/core/layout/anchoredobject.cxx   |2 +-
 sw/source/core/layout/flowfrm.cxx  |2 +-
 sw/source/core/layout/flylay.cxx   |4 ++--
 sw/source/core/layout/frmtool.cxx  |4 ++--
 sw/source/core/layout/tabfrm.cxx   |2 +-
 sw/source/core/layout/trvlfrm.cxx  |2 +-
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx |2 +-
 sw/source/core/txtnode/ndtxt.cxx   |6 
+++---
 sw/source/core/unocore/unosett.cxx |2 +-
 sw/source/uibase/app/docstyle.cxx  |2 +-
 sw/source/uibase/shells/txtnum.cxx |2 +-
 xmloff/source/text/XMLTextListBlockContext.cxx |2 +-
 xmloff/source/text/XMLTextNumRuleInfo.cxx  |4 ++--
 xmloff/source/text/txtimp.cxx  |2 +-
 xmloff/source/text/txtparae.cxx|6 
+++---
 34 files changed, 55 insertions(+), 55 deletions(-)

New commits:
commit 4b3f9fa6740be355e5cdadd8a41ecbd8d9ace298
Author: Miklos Vajna 
Date:   Tue Sep 29 09:54:41 2015 +0200

Nobody would go down the corridor anymore

Change-Id: Ic2cb2c4d9534d503828308183d55cea5b8d88112

diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index dfd564a..33b3765 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -362,7 +362,7 @@ public:
 DBG_ASSERT( !pIgnorableItems || !pIgnorableItems->Count(),
 " - misusage: item set 
for ignorable item should be empty. Please correct usage." );
 DBG_ASSERT( !mpIgnorableItems || !mpIgnorableItems->Count(),
-" -  does not work as excepted -  is not empty. 
Please inform OD." );
+" -  does not work as excepted -  is not empty." );
 }
 
 ~StylePoolImpl()
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx 
b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index ff59bdd..14f16ff 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -190,7 +190,7 @@ bool SwNodeNum::HasCountedChildren() const
 {
 SwNodeNum* pChild( dynamic_cast(*aIt) );
 OSL_ENSURE( pChild,
-" - unexpected type of child 
-> please inform OD" );
+" - unexpected type of child" 
);
 if ( pChild &&
  ( pChild->IsCountedForNumbering() ||
pChild->HasCountedChildren() ) )
@@ -263,7 +263,7 @@ bool SwNodeNum::IsCountPhantoms() const
   mpNumRule->IsCountPhantoms();
 else
 {
-OSL_FAIL( " - parameter  out 
of valid range. Serious defect -> please inform OD." );
+OSL_FAIL( " - parameter  out 
of valid range. Serious defect." );
 return;
 }
 
@@ -829,7 +829,7 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel 
)
 {
 if ( nLevel < 0 )
 {
-OSL_FAIL( " - parameter 
 out of valid range. Serious defect -> please inform OD." );
+OSL_FAIL( " - parameter 
 out of valid range. Serious defect." );
 return;
 }
 
@@ -841,7 +841,7 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel 
)
 {
 

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/map/handler/Map.Keyboard.js |   42 +-
 1 file changed, 30 insertions(+), 12 deletions(-)

New commits:
commit 6ead2c072f92b81c977fa35c4e2b870ad3222fd1
Author: Mihai Varga 
Date:   Thu Sep 24 19:46:15 2015 +0200

loleaflet: handle shift + arrow keys selection

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index b98c495..e54fbb0 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -10,6 +10,13 @@ L.Map.mergeOptions({
 
 L.Map.Keyboard = L.Handler.extend({
 
+   keyModifier: {
+   shift: 4096,
+   ctrl: 8192,
+   alt: 16384,
+   ctrlMac: 32768
+   },
+
keymap: {
8   : 1283, // backspace: BACKSPACE
9   : 1282, // tab  : TAB
@@ -129,8 +136,8 @@ L.Map.Keyboard = L.Handler.extend({
 
_setPanOffset: function (pan) {
var keys = this._panKeys = {},
-   codes = this.navigationKeyCodes,
-   i, len;
+   codes = this.navigationKeyCodes,
+   i, len;
 
for (i = 0, len = codes.left.length; i < len; i++) {
keys[codes.left[i]] = [-1 * pan, 0];
@@ -148,8 +155,8 @@ L.Map.Keyboard = L.Handler.extend({
 
_setZoomOffset: function (zoom) {
var keys = this._zoomKeys = {},
-   codes = this.navigationKeyCodes,
-   i, len;
+   codes = this.navigationKeyCodes,
+   i, len;
 
for (i = 0, len = codes.zoomIn.length; i < len; i++) {
keys[codes.zoomIn[i]] = zoom;
@@ -172,7 +179,6 @@ L.Map.Keyboard = L.Handler.extend({
},
 
_onKeyDown: function (e) {
-   var docLayer = this._map._docLayer;
if (e.originalEvent.ctrlKey) {
// we prepare for a copy event
docLayer._textArea.value = 'dummy text';
@@ -181,24 +187,31 @@ L.Map.Keyboard = L.Handler.extend({
return;
}
 
+   var docLayer = this._map._docLayer;
+   var charCode = e.originalEvent.charCode;
+   var keyCode = e.originalEvent.keyCode;
+   var unoKeyCode = this._toUNOKeyCode(keyCode);
+
+   if (e.originalEvent.shiftKey) {
+   unoKeyCode |= this.keyModifier.shift;
+   }
+
if (docLayer._permission === 'edit') {
docLayer._resetPreFetching();
-   var charCode = e.originalEvent.charCode;
-   var keyCode = e.originalEvent.keyCode;
if (e.type === 'keydown' && 
this.handleOnKeyDown[keyCode] && charCode === 0) {
-   docLayer._postKeyboardEvent('input', charCode, 
this._toUNOKeyCode(keyCode));
+   docLayer._postKeyboardEvent('input', charCode, 
unoKeyCode);
}
else if (e.type === 'keypress' &&
-   (!this.handleOnKeyDown[keyCode] || 
charCode !== 0)) {
+   (!this.handleOnKeyDown[keyCode] || charCode !== 
0)) {
if (charCode === keyCode && charCode !== 13) {
// Chrome sets keyCode = charCode for 
printable keys
// while LO requires it to be 0
keyCode = 0;
}
-   docLayer._postKeyboardEvent('input', charCode, 
this._toUNOKeyCode(keyCode));
+   docLayer._postKeyboardEvent('input', charCode, 
unoKeyCode);
}
else if (e.type === 'keyup') {
-   docLayer._postKeyboardEvent('up', charCode, 
this._toUNOKeyCode(keyCode));
+   docLayer._postKeyboardEvent('up', charCode, 
unoKeyCode);
}
if (keyCode === 9) {
// tab would change focus to other DOM elements
@@ -208,12 +221,17 @@ L.Map.Keyboard = L.Handler.extend({
else if (e.type === 'keydown') {
var key = e.originalEvent.keyCode;
var map = this._map;
-   if (key in this._panKeys) {
+   if (key in this._panKeys && !e.originalEvent.shiftKey) {
if (map._panAnim && map._panAnim._inProgress) {
return;
}
map.fire('scrollby', {x: this._panKeys[key][0], 
y: this._panKeys[key][1]});
}
+