[Libreoffice-commits] core.git: sax/qa

[Justin Luth]

 sax/qa/cppunit/xmlimport.cxx |   24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

New commits:
commit d9280e97c6e7b27742f26930af56b39a7d4edd75
Author: Justin Luth 
Date:   Wed Oct 12 15:13:37 2016 +0300

tdf#103159 allow compiling on 12.04 systems still

"An uncaught exception of type com.sun.star.xml.sax.SAXParseException
 [internal line 13]: Namespace prefix manifest on file-entry is not defined"

regression from 3aa52d36824d11b8774de15708fdfcbb93cd9dc3
which states that "initialization parameter to FastParser will turn off
the namespace declaration missing exception."

However, although it doesn't RAISE the exception, it doesn't prevent it
either.

Change-Id: I26ea02444132e5370dcb4821a75181bc8c76e553
Reviewed-on: https://gerrit.libreoffice.org/29731
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index 457f5f1..915f26e 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -432,18 +432,24 @@ void XMLImportTest::testMissingNamespaceDeclaration()
 
 for (sal_uInt16 i = 0; i < sizeof( fileNames ) / sizeof( OUString ); i++)
 {
-InputSource source;
-source.sSystemId= "internal";
+try
+{
+InputSource source;
+source.sSystemId= "internal";
 
-source.aInputStream = createStreamFromFile( m_sDirPath + fileNames[i] 
);
-m_xParser->parseStream(source);
-const OUString rParserStr = m_xDocumentHandler->getString();
+source.aInputStream = createStreamFromFile( m_sDirPath + 
fileNames[i] );
+m_xParser->parseStream(source);
+const OUString rParserStr = m_xDocumentHandler->getString();
 
-source.aInputStream = createStreamFromFile( m_sDirPath + fileNames[i] 
);
-m_xLegacyFastParser->parseStream(source);
-const OUString rLegacyFastParserStr = m_xDocumentHandler->getString();
+source.aInputStream = createStreamFromFile( m_sDirPath + 
fileNames[i] );
+m_xLegacyFastParser->parseStream(source);
+const OUString rLegacyFastParserStr = 
m_xDocumentHandler->getString();
 
-CPPUNIT_ASSERT_EQUAL( rParserStr, rLegacyFastParserStr );
+CPPUNIT_ASSERT_EQUAL( rParserStr, rLegacyFastParserStr );
+}
+catch( SAXException )
+{
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/filter/excel/excform.cxx |4 ++--
 sc/source/filter/excel/impop.cxx   |2 +-
 sc/source/filter/excel/xelink.cxx  |2 +-
 sc/source/filter/excel/xichart.cxx |2 +-
 sc/source/filter/xml/xmlcelli.cxx  |6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c31fe18cb50724557a9b8272329addf5f818ef47
Author: Eike Rathke 
Date:   Wed Oct 12 20:41:42 2016 +0200

use isFinite() instead of !isNan()

... to cover (theoretical?) +/-inf values as well.

Change-Id: I23ab17f905bbd32345b88bea87ad6f010a5406ad

diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index d911f18..67e7657 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -131,7 +131,7 @@ void ImportExcel::Formula(
 rDoc.getDoc().EnsureTable(aScPos.Tab());
 rDoc.setFormulaCell(aScPos, pCell);
 pCell->SetNeedNumberFormat(false);
-if (!rtl::math::isNan(fCurVal))
+if (rtl::math::isFinite(fCurVal))
 pCell->SetResultDouble(fCurVal);
 
 GetXFRangeBuffer().SetXF(aScPos, nXF);
@@ -173,7 +173,7 @@ void ImportExcel::Formula(
 if( eErr != ConvOK )
 ExcelToSc::SetError( *pCell, eErr );
 
-if (!rtl::math::isNan(fCurVal))
+if (rtl::math::isFinite(fCurVal))
 pCell->SetResultDouble(fCurVal);
 }
 
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index ad28654..01b5b73 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -869,7 +869,7 @@ void ImportExcel::Shrfmla()
 rDoc.getDoc().EnsureTable(aPos.Tab());
 rDoc.setFormulaCell(aPos, pCell);
 pCell->SetNeedNumberFormat(false);
-if (!rtl::math::isNan(mpLastFormula->mfValue))
+if (rtl::math::isFinite(mpLastFormula->mfValue))
 pCell->SetResultDouble(mpLastFormula->mfValue);
 
 GetXFRangeBuffer().SetXF(aPos, mpLastFormula->mnXF);
diff --git a/sc/source/filter/excel/xelink.cxx 
b/sc/source/filter/excel/xelink.cxx
index b850510..2bfe779 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1182,7 +1182,7 @@ void XclExpCrn::WriteBool( XclExpStream& rStrm, bool 
bValue )
 
 void XclExpCrn::WriteDouble( XclExpStream& rStrm, double fValue )
 {
-if( ::rtl::math::isNan( fValue ) )
+if( !::rtl::math::isFinite( fValue ) )
 {
 FormulaError nScError = GetDoubleErrorValue(fValue);
 WriteError( rStrm, XclTools::GetXclErrorCode( nScError ) );
diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index 8739a44d..ac12021 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1639,7 +1639,7 @@ Reference< XRegressionCurve > 
XclImpChSerTrendLine::CreateRegressionCurve() cons
 aPropSet.SetProperty(EXC_CHPROP_EXTRAPOLATE_FORWARD, 
maData.mfForecastFor);
 aPropSet.SetProperty(EXC_CHPROP_EXTRAPOLATE_BACKWARD, 
maData.mfForecastBack);
 
-bool bForceIntercept = !rtl::math::isNan(maData.mfIntercept);
+bool bForceIntercept = rtl::math::isFinite(maData.mfIntercept);
 aPropSet.SetProperty(EXC_CHPROP_FORCE_INTERCEPT, bForceIntercept);
 if (bForceIntercept)
 {
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 1369dbc..4633eb7 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1034,7 +1034,7 @@ void 
ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const
 pFCell->ResetDirty();
 }
 }
-else if (!rtl::math::isNan(fValue))
+else if (rtl::math::isFinite(fValue))
 {
 pFCell->SetHybridDouble(fValue);
 pFCell->ResetDirty();
@@ -1165,7 +1165,7 @@ void ScXMLTableRowCellContext::PutValueCell( const 
ScAddress& rCurrentPos )
 // fdo#62250 absent values are not NaN, set to 0.0
 // PutValueCell() is called only for a known cell value type,
 // bIsEmpty==false in all these cases, no sense to check it here.
-if (::rtl::math::isNan( fValue))
+if (!::rtl::math::isFinite( fValue))
 fValue = 0.0;
 
 // #i62435# Initialize the value cell's script type if the default
@@ -1451,7 +1451,7 @@ void ScXMLTableRowCellContext::AddFormulaCell( const 
ScAddress& rCellPos )
 pFCell->ResetDirty();
 }
 }
-else if (!rtl::math::isNan(fValue))
+else if (rtl::math::isFinite(fValue))
 {
 pFCell->SetResultMatrix(
 nMatrixCols, nMatrixRows, pMat, new 
formula::FormulaDoubleToken(fValue));
___
Libreoffice-commits mailing list

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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16fd5a6e7dbf7dabc1d8c53cd3aa6c1a50ff7892
Author: Eike Rathke 
Date:   Wed Oct 12 21:11:44 2016 +0200

propagate original named expression error, if any

... instead of substituting with NoName error.

Change-Id: Id80f46f0f4c17a0fd06abdf821d1cf5ca5d7a3ec

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 834c7ab..fa117a0 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4665,7 +4665,7 @@ bool ScCompiler::HandleRange()
 {
 FormulaError nErr = pRangeData->GetErrCode();
 if( nErr != FormulaError::NONE )
-SetError( FormulaError::NoName );
+SetError( nErr );
 else if (mbJumpCommandReorder)
 {
 // put named formula into parentheses.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ucb/qa ucb/source

[Giuseppe Castagno]

 ucb/qa/cppunit/webdav/webdav_options.cxx |   33 +++
 ucb/source/ucp/webdav-neon/DAVTypes.cxx  |   46 +++
 ucb/source/ucp/webdav-neon/DAVTypes.hxx  |7 ++--
 ucb/source/ucp/webdav-neon/webdavcontent.cxx |6 +--
 4 files changed, 54 insertions(+), 38 deletions(-)

New commits:
commit 1ca68d386bc0345240bf288bec023faaba2e07af
Author: Giuseppe Castagno 
Date:   Tue Oct 11 15:21:23 2016 +0200

tdf#102499 (6): Cache OPTIONS if not present or if lifetime different

Add the OPTIONS information and response status code into the cache:
- if the OPTIONS information is already cached, update the cache only
  if the lifetime is different;
- if the OPTIONS information is not cached, cache it.

Add some new functions in DAVOptions to support the change and remove
a function no longer used.

Change-Id: I2f28f0ee793ec7d898caa61cc0a4962334e6e068
Reviewed-on: https://gerrit.libreoffice.org/29733
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 

diff --git a/ucb/qa/cppunit/webdav/webdav_options.cxx 
b/ucb/qa/cppunit/webdav/webdav_options.cxx
index 0dad7f8..ce3aba7 100644
--- a/ucb/qa/cppunit/webdav/webdav_options.cxx
+++ b/ucb/qa/cppunit/webdav/webdav_options.cxx
@@ -65,6 +65,7 @@ namespace
 CPPUNIT_ASSERT_EQUAL( true, aDavType.getURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( true, aDavType.getRedirectedURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavType.getStaleTime() );
+CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavType.getRequestedTimeLife() 
);
 CPPUNIT_ASSERT_EQUAL( sal_uInt16( 0 ), 
aDavType.getHttpResponseStatusCode() );
 CPPUNIT_ASSERT_EQUAL( true, 
aDavType.getHttpResponseStatusText().isEmpty() );
 }
@@ -83,6 +84,7 @@ namespace
 CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isLockAllowed() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getAllowedMethods().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getStaleTime() );
+CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getRequestedTimeLife() 
);
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getRedirectedURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt16( 0 ), 
aDavOpt.getHttpResponseStatusCode() );
@@ -97,6 +99,7 @@ namespace
 CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isLockAllowed() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getAllowedMethods().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getStaleTime() );
+CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getRequestedTimeLife() 
);
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getRedirectedURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt16( 0 ), 
aDavOpt.getHttpResponseStatusCode() );
@@ -111,6 +114,7 @@ namespace
 CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isLockAllowed() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getAllowedMethods().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getStaleTime() );
+CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getRequestedTimeLife() 
);
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getRedirectedURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt16( 0 ), 
aDavOpt.getHttpResponseStatusCode() );
@@ -125,6 +129,7 @@ namespace
 CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isLockAllowed() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getAllowedMethods().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getStaleTime() );
+CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getRequestedTimeLife() 
);
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getRedirectedURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt16( 0 ), 
aDavOpt.getHttpResponseStatusCode() );
@@ -142,6 +147,7 @@ namespace
 CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isLockAllowed() );
 CPPUNIT_ASSERT_EQUAL( aAllowedMethods, aDavOpt.getAllowedMethods() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getStaleTime() );
+CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getRequestedTimeLife() 
);
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.getRedirectedURL().isEmpty() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt16( 0 ), 
aDavOpt.getHttpResponseStatusCode() );
@@ -158,6 +164,7 @@ namespace
 CPPUNIT_ASSERT_EQUAL( true, aDavOpt.isLockAllowed() );
 CPPUNIT_ASSERT_EQUAL( aAllowedMethods, aDavOpt.getAllowedMethods() );
 CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), aDavOpt.getStaleTime() );
+CPPUNIT_ASSERT_EQUAL( sal_uInt32( 0 ), 

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

[Henry Castro]

 loleaflet/dist/spreadsheet.css  |1 -
 loleaflet/src/control/Control.Header.js |   17 +
 2 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 25dce7a30f5519b2dd6f3316355c9dc1c76ec9ed
Author: Henry Castro 
Date:   Wed Oct 12 17:30:52 2016 -0400

loleaflet: column/row re-size cleanup

diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index 30c992c..c119f05 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -138,7 +138,6 @@
padding: 0px;
margin: 0px;
height: 100%;
-   cursor: pointer;
overflow: hidden;
}
 
diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index 24ed4f7..a3014a1 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -39,26 +39,19 @@ L.Control.Header = L.Control.extend({
 
_onMouseMove: function (e) {
this._dragging = true;
+   L.DomEvent.preventDefault(e);
 
var target = e.target || e.srcElement;
-   if ((L.DomUtil.hasClass(target, 
'spreadsheet-header-column-text') ||
-L.DomUtil.hasClass(target, 'spreadsheet-header-row-text')) 
&&
-   target.style.cursor != this.options.cursor) {
-   this._cursor = target.style.cursor;
-   this._target = target;
+   if (target.style.cursor !== this.options.cursor &&
+  (L.DomUtil.hasClass(target, 
'spreadsheet-header-column-text') ||
+   L.DomUtil.hasClass(target, 'spreadsheet-header-row-text'))) 
{
target.style.cursor = this.options.cursor;
}
 
-   L.DomEvent.preventDefault(e);
-
this.onDragMove(this._item, this._start, this._offset, e);
},
 
_onMouseUp: function (e) {
-   if (this._target) {
-   this._target.style.cursor = this._oldCursor;
-   }
-
L.DomEvent.off(document, 'mousemove', this._onMouseMove, this);
L.DomEvent.off(document, 'mouseup', this._onMouseUp, this);
 
@@ -73,7 +66,7 @@ L.Control.Header = L.Control.extend({
setTimeout(L.bind(this.initialize, this), 400);
}
 
-   this._target = this._cursor = this._item = this._start = 
this._offset = null;
+   this._item = this._start = this._offset = null;
this._dragging = false;
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/ado/AResultSet.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 66b67f40a7785f08ae214e62b669e001148b474c
Author: Stephan Bergmann 
Date:   Wed Oct 12 16:17:38 2016 +0200

ADO: return correct css::sdbcx::CompareBookmark values

css.sdbcx.XRowLocate's compareBookmarks is documented to return values from 
the
css.sdbcx.ConpareBookmark constants group, which has LESS = -1, EQUAL = 0,
GREATER = 1, NOT_EQUAL = 2, NOT_COMPARABLE = 3.  So in case of equality 
return
EQUAL (0) instead of sal_True (1).  And, in the MS SDK's adoint.h, the
CompareEnum enum os defined with enumeators adCompareLessThan = 0,
adCompareEqual = 1, adCompareGreaterThan = 2, adCompareNotEqual = 3,
adCOmpareNotComparable = 4, so mapping from the latter to the former needs 
to do
-1, not +1.

Change-Id: I6643da31f326e38153e4ebab9e680b33a6854918
Reviewed-on: https://gerrit.libreoffice.org/29735
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/ado/AResultSet.cxx 
b/connectivity/source/drivers/ado/AResultSet.cxx
index 128458bc..020c643 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -872,13 +873,13 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const 
Any& bookmark1, const Any
 sal_Int32 nPos2 = 0;
 bookmark2 >>= nPos2;
 if(nPos1 == nPos2)  // they should be equal
-return sal_True;
+return css::sdbcx::CompareBookmark::EQUAL;
 
 OSL_ENSURE((nPos1 >= 0 && nPos1 < (sal_Int32)m_aBookmarks.size()) || 
(nPos1 >= 0 && nPos2 < (sal_Int32)m_aBookmarks.size()),"Invalid Index for 
vector");
 
 CompareEnum eNum;
 
m_pRecordSet->CompareBookmarks(m_aBookmarks[nPos1],m_aBookmarks[nPos2],);
-return ((sal_Int32)eNum) +1;
+return ((sal_Int32)eNum) - 1;
 }
 
 sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw(SQLException, 
RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source cui/source

[Noel Grandin]

 connectivity/source/drivers/postgresql/pq_xtable.cxx |7 ---
 connectivity/source/drivers/postgresql/pq_xtable.hxx |4 
 cui/source/customize/acccfg.cxx  |9 -
 cui/source/dialogs/hltpbase.cxx  |5 -
 cui/source/inc/acccfg.hxx|4 
 cui/source/inc/hltpbase.hxx  |2 --
 6 files changed, 31 deletions(-)

New commits:
commit a9717054dcb59010c95bdbfdb440ac12e8703796
Author: Noel Grandin 
Date:   Tue Oct 11 10:47:01 2016 +0200

loplugin:unnecessaryoverride in connectivity/cui

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

diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx 
b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 4b8d451..ddc96f6 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -311,13 +311,6 @@ Any Table::queryInterface( const Type & reqType ) throw 
(RuntimeException, std::
 return ret;
 }
 
-css::uno::Any Table::getPropertyValue(const OUString& aPropertyName)
-throw(css::beans::UnknownPropertyException, 
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
-{
-return ReflectionBase::getPropertyValue( aPropertyName );
-}
-
-
 OUString Table::getName(  ) throw (css::uno::RuntimeException, std::exception)
 {
 Statics & st = getStatics();
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx 
b/connectivity/source/drivers/postgresql/pq_xtable.hxx
index 3ff598c..759ddda 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx
@@ -123,10 +123,6 @@ public:
css::lang::IndexOutOfBoundsException,
css::uno::RuntimeException, std::exception) override;
 
-// TODO: remove again
-virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& 
aPropertyName)
-throw(css::beans::UnknownPropertyException, 
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) 
override;
-
 // XNamed
 virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, 
std::exception) override;
 virtual void SAL_CALL setName( const OUString& aName ) throw 
(css::uno::RuntimeException, std::exception) override;
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index c3f14d1..ae7d1cc 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -675,15 +675,6 @@ VCL_BUILDER_DECL_FACTORY(SfxAccCfgTabListBox)
 rRet = VclPtr::Create(pParent, nWinBits);
 }
 
-void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry,
- const OUString& rText,
- const Image& rImage1,
- const Image& rImage2,
- SvLBoxButtonKind eButtonKind)
-{
-SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind);
-}
-
 SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl()
 {
 disposeOnce();
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 226e7a6..bb63d88 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -97,11 +97,6 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const 
ExecuteDropEvent& rEvt )
 return nRet;
 }
 
-void SvxHyperURLBox::Modify()
-{
-SvtURLBox::Modify();
-}
-
 //# Hyperlink-Dialog: Tabpages-Baseclass #
 
 SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( vcl::Window *pParent,
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 24b92c90..d59cdc0 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -57,10 +57,6 @@ class SfxAccCfgTabListBox_Impl : public SvTabListBox
 
 voidKeyInput( const KeyEvent  ) override;
 
-protected:
-virtual voidInitEntry(SvTreeListEntry*, const OUString&, 
const Image&,
-  const Image&, SvLBoxButtonKind 
eButtonKind) override;
-
 public:
 SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle)
 : SvTabListBox(pParent, nStyle)
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 4f24e11..642d281 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -53,8 +53,6 @@ protected:
 virtual sal_Int8AcceptDrop( const AcceptDropEvent& rEvt ) override;
 virtual sal_Int8ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
 
-virtual voidModify() override;
-
 public:
 SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart 

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

[Noel Grandin]

 svx/inc/dragmt3d.hxx  |6 +++---
 svx/inc/sdr/overlay/overlayhelpline.hxx   |2 +-
 svx/inc/sdr/overlay/overlaymanagerbuffered.hxx|2 +-
 svx/inc/sdr/overlay/overlayrollingrectangle.hxx   |2 +-
 svx/inc/sdr/overlay/overlaytools.hxx  |4 ++--
 svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx |4 ++--
 svx/inc/sxmoitm.hxx   |2 +-
 svx/inc/xpolyimp.hxx  |2 +-
 svx/source/form/fmvwimp.cxx   |2 +-
 svx/source/inc/filtnav.hxx|4 ++--
 svx/source/inc/fmexpl.hxx |2 +-
 svx/source/inc/fmundo.hxx |2 +-
 svx/source/inc/gridcell.hxx   |2 +-
 svx/source/svdraw/svdibrow.cxx|2 +-
 svx/source/svdraw/svdmrkv.cxx |2 +-
 svx/source/table/celltypes.hxx|2 +-
 svx/source/tbxctrls/tbcontrl.cxx  |2 +-
 17 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit c2808e3178b28528c23557321683b10b6ab5371f
Author: Noel Grandin 
Date:   Tue Oct 11 11:27:13 2016 +0200

loplugin:countusersofdefaultparams in svx

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

diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 5097e0a..1bf8f9b 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -66,7 +66,7 @@ public:
 E3dDragMethod(
 SdrDragView ,
 const SdrMarkList& rMark,
-E3dDragConstraint eConstr = E3dDragConstraint::XYZ,
+E3dDragConstraint eConstr,
 bool bFull = false);
 
 virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -88,7 +88,7 @@ public:
 E3dDragRotate(
 SdrDragView ,
 const SdrMarkList& rMark,
-E3dDragConstraint eConstr = E3dDragConstraint::XYZ,
+E3dDragConstraint eConstr,
 bool bFull = false);
 
 virtual void MoveSdrDrag(const Point& rPnt) override;
@@ -105,7 +105,7 @@ public:
 E3dDragMove(
 SdrDragView ,
 const SdrMarkList& rMark,
-SdrHdlKind eDrgHdl = SdrHdlKind::Move,
+SdrHdlKind eDrgHdl,
 E3dDragConstraint eConstr = E3dDragConstraint::XYZ,
 bool bFull = false);
 
diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx 
b/svx/inc/sdr/overlay/overlayhelpline.hxx
index 7329dcf..4778312 100644
--- a/svx/inc/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/sdr/overlay/overlayhelpline.hxx
@@ -40,7 +40,7 @@ namespace sdr
 public:
 explicit OverlayHelplineStriped(
 const basegfx::B2DPoint& rBasePos,
-SdrHelpLineKind eNewKind = SdrHelpLineKind::Point);
+SdrHelpLineKind eNewKind);
 virtual ~OverlayHelplineStriped() override;
 
 // dat read access
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx 
b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 42fcf21..6712e49 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -62,7 +62,7 @@ namespace sdr
 
 OverlayManagerBuffered(
 OutputDevice& rOutputDevice,
-bool bRefreshWithPreRendering = false);
+bool bRefreshWithPreRendering);
 virtual ~OverlayManagerBuffered() override;
 
 public:
diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx 
b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
index 2cab780..7b00d90 100644
--- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
@@ -46,7 +46,7 @@ namespace sdr
 OverlayRollingRectangleStriped(
 const basegfx::B2DPoint& rBasePos,
 const basegfx::B2DPoint& rSecondPos,
-bool bExtendedLines = false,
+bool bExtendedLines,
 bool bShowBounds = true);
 virtual ~OverlayRollingRectangleStriped() override;
 
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx 
b/svx/inc/sdr/overlay/overlaytools.hxx
index 224135b3..197cc71 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -95,8 +95,8 @@ namespace drawinglayer
 const basegfx::B2DPoint& rBasePosition,
 sal_uInt16 nCenterX,
 sal_uInt16 nCenterY,
-double fShearX = 0.0,
-double fRotation = 0.0);
+double fShearX,
+double fRotation);
 
 // data access
 const BitmapEx& getBitmapEx() const { return maBitmapEx; }
diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - 4 commits - loleaflet/src loolwsd/ClientSession.cpp loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/.gi

[Tor Lillqvist]

 loleaflet/src/core/Socket.js  |   15 +++-
 loleaflet/src/layer/tile/TileLayer.js |   16 +++-
 loleaflet/src/map/handler/Map.Keyboard.js |3 
 loolwsd/.gitignore|1 
 loolwsd/ClientSession.cpp |3 
 loolwsd/DocumentBroker.cpp|8 +-
 loolwsd/DocumentBroker.hpp|4 +
 loolwsd/LOOLForKit.cpp|   12 +--
 loolwsd/LOOLKit.cpp   |   13 +--
 loolwsd/LOOLWSD.cpp   |4 -
 loolwsd/protocol.txt  |5 -
 loolwsd/test/Makefile.am  |   14 ---
 loolwsd/test/helpers.hpp  |3 
 loolwsd/test/test.cpp |3 
 loolwsd/test/testlokit.cpp|  107 --
 15 files changed, 61 insertions(+), 150 deletions(-)

New commits:
commit 5dd3490b6255e2886559a50b0959bae1289c711d
Author: Tor Lillqvist 
Date:   Wed Oct 12 11:47:26 2016 +0300

Use std::getenv() consistently

(cherry picked from commit 9fee650f437c58538d6cf486c4e77b5541cba50c)

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 7a38541..735d0d7 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -199,10 +199,10 @@ int main(int argc, char** argv)
 }
 
 // Initialization
-const bool logToFile = getenv("LOOL_LOGFILE");
-const char* logFilename = getenv("LOOL_LOGFILENAME");
-const char* logLevel = getenv("LOOL_LOGLEVEL");
-const char* logColor = getenv("LOOL_LOGCOLOR");
+const bool logToFile = std::getenv("LOOL_LOGFILE");
+const char* logFilename = std::getenv("LOOL_LOGFILENAME");
+const char* logLevel = std::getenv("LOOL_LOGLEVEL");
+const char* logColor = std::getenv("LOOL_LOGCOLOR");
 std::map logProperties;
 if (logToFile && logFilename)
 {
@@ -220,11 +220,11 @@ int main(int argc, char** argv)
 std::string loTemplate;
 
 #if ENABLE_DEBUG
-static const char* clientPort = getenv("LOOL_TEST_CLIENT_PORT");
+static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
 if (clientPort)
 ClientPortNumber = std::stoi(clientPort);
 
-static const char* masterPort = getenv("LOOL_TEST_MASTER_PORT");
+static const char* masterPort = std::getenv("LOOL_TEST_MASTER_PORT");
 if (masterPort)
 MasterPortNumber = std::stoi(masterPort);
 #endif
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 089b695..d0c5826 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -13,15 +13,14 @@
 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1304,10 +1303,10 @@ void lokit_main(const std::string& childRoot,
 bool displayVersion)
 {
 // Reinitialize logging when forked.
-const bool logToFile = getenv("LOOL_LOGFILE");
-const char* logFilename = getenv("LOOL_LOGFILENAME");
-const char* logLevel = getenv("LOOL_LOGLEVEL");
-const char* logColor = getenv("LOOL_LOGCOLOR");
+const bool logToFile = std::getenv("LOOL_LOGFILE");
+const char* logFilename = std::getenv("LOOL_LOGFILENAME");
+const char* logLevel = std::getenv("LOOL_LOGLEVEL");
+const char* logColor = std::getenv("LOOL_LOGCOLOR");
 std::map logProperties;
 if (logToFile && logFilename)
 {
@@ -1370,7 +1369,7 @@ void lokit_main(const std::string& childRoot,
 
 // Copy (link) LO installation and other necessary files into it 
from the template.
 bool bLoopMounted = false;
-if (getenv("LOOL_BIND_MOUNT"))
+if (std::getenv("LOOL_BIND_MOUNT"))
 {
 Path usrSrcPath(sysTemplate, "usr");
 Path usrDestPath(jailPath, "usr");
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 79d1986..ec375ea 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1803,11 +1803,11 @@ void LOOLWSD::handleOption(const std::string& 
optionName,
 else if (optionName == "careerspan")
 careerSpanSeconds = std::stoi(value);
 
-static const char* clientPort = getenv("LOOL_TEST_CLIENT_PORT");
+static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
 if (clientPort)
 ClientPortNumber = std::stoi(clientPort);
 
-static const char* masterPort = getenv("LOOL_TEST_MASTER_PORT");
+static const char* masterPort = std::getenv("LOOL_TEST_MASTER_PORT");
 if (masterPort)
 MasterPortNumber = std::stoi(masterPort);
 #endif
diff --git a/loolwsd/test/helpers.hpp b/loolwsd/test/helpers.hpp
index bed5788..5f5a5c1 100644
--- a/loolwsd/test/helpers.hpp
+++ b/loolwsd/test/helpers.hpp
@@ -10,6 +10,7 @@
 #include "config.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -118,7 +119,7 @@ Poco::Net::HTTPClientSession* createSession(const 
Poco::URI& uri)

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

[Miklos Vajna]

 sfx2/source/view/classificationhelper.cxx |   28 
 1 file changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 8ee31c5aac07a28a8208b4c2ca62025f3dafbb35
Author: Miklos Vajna 
Date:   Wed Oct 12 09:00:34 2016 +0200

sfx2: clean up redundant virtual keywords in classificationhelper

Change-Id: If6da4e79c17dc27a13e043a3f23cdbac0ae7f7d0

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index 500e279..0a6974f 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -117,24 +117,24 @@ public:
 SfxClassificationCategory* m_pCategory;
 
 SfxClassificationParser();
-virtual ~SfxClassificationParser() override;
+~SfxClassificationParser() override;
 
-virtual void SAL_CALL startDocument() throw (xml::sax::SAXException, 
uno::RuntimeException, std::exception) override;
+void SAL_CALL startDocument() throw (xml::sax::SAXException, 
uno::RuntimeException, std::exception) override;
 
-virtual void SAL_CALL endDocument() throw (xml::sax::SAXException, 
uno::RuntimeException, std::exception) override;
+void SAL_CALL endDocument() throw (xml::sax::SAXException, 
uno::RuntimeException, std::exception) override;
 
-virtual void SAL_CALL startElement(const OUString& aName, const 
uno::Reference& xAttribs)
+void SAL_CALL startElement(const OUString& aName, const 
uno::Reference& xAttribs)
 throw (xml::sax::SAXException, uno::RuntimeException, std::exception) 
override;
 
-virtual void SAL_CALL endElement(const OUString& aName) throw 
(xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+void SAL_CALL endElement(const OUString& aName) throw 
(xml::sax::SAXException, uno::RuntimeException, std::exception) override;
 
-virtual void SAL_CALL characters(const OUString& aChars) throw 
(xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+void SAL_CALL characters(const OUString& aChars) throw 
(xml::sax::SAXException, uno::RuntimeException, std::exception) override;
 
-virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) 
throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw 
(xml::sax::SAXException, uno::RuntimeException, std::exception) override;
 
-virtual void SAL_CALL processingInstruction(const OUString& aTarget, const 
OUString& aData) throw (xml::sax::SAXException, uno::RuntimeException, 
std::exception) override;
+void SAL_CALL processingInstruction(const OUString& aTarget, const 
OUString& aData) throw (xml::sax::SAXException, uno::RuntimeException, 
std::exception) override;
 
-virtual void SAL_CALL setDocumentLocator(const 
uno::Reference& xLocator)
+void SAL_CALL setDocumentLocator(const uno::Reference& 
xLocator)
 throw (xml::sax::SAXException, uno::RuntimeException, std::exception) 
override;
 };
 
@@ -150,9 +150,7 @@ SfxClassificationParser::SfxClassificationParser()
 {
 }
 
-SfxClassificationParser::~SfxClassificationParser()
-{
-}
+SfxClassificationParser::~SfxClassificationParser() = default;
 
 void SAL_CALL SfxClassificationParser::startDocument() throw 
(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
@@ -188,7 +186,7 @@ throw (xml::sax::SAXException, uno::RuntimeException, 
std::exception)
 OUString aIdentifier = xAttribs->getValueByName("Identifier");
 
 // Create a new category and initialize it with the data that's 
true for all categories.
-m_aCategories.push_back(SfxClassificationCategory());
+m_aCategories.emplace_back(SfxClassificationCategory());
 SfxClassificationCategory& rCategory = m_aCategories.back();
 rCategory.m_aName = aName;
 rCategory.m_aLabels["PolicyAuthority:Name"] = 
m_aPolicyAuthorityName;
@@ -552,9 +550,7 @@ SfxClassificationHelper::SfxClassificationHelper(const 
uno::Referencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sw/uiconfig/swriter/menubar/menubar.xml |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 34698034dbfe59bf444709fcf54d01f8a6f03f83
Author: Samuel Mehrbrodt 
Date:   Tue Oct 11 21:54:12 2016 +0200

Remove double 'Safe Mode' menu entry from Writer

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

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index fefaf80..ee638a0 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -748,8 +748,6 @@
   
   
   
-  
-  
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Rishabh Kumar]

 cui/source/inc/cuitabarea.hxx   |   21 +++-
 cui/source/tabpages/tabarea.cxx |   61 --
 cui/uiconfig/ui/areadialog.ui   |   70 
 3 files changed, 21 insertions(+), 131 deletions(-)

New commits:
commit d19ec9a9bd371248afd7c3ca091a54b1782fddf7
Author: Rishabh Kumar 
Date:   Thu Aug 4 13:42:24 2016 +0530

[GSoC] Remove fill style tabs from area fill dialog

Change-Id: I7409118cbbab1350dda169d5bdfef51b7354de9f
Reviewed-on: https://gerrit.libreoffice.org/27864
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 7f1decb..2d612b3 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -106,11 +106,6 @@ class SvxAreaTabDialog : public SfxTabDialog
 sal_uInt16m_nAreaTabPage;
 sal_uInt16m_nShadowTabPage;
 sal_uInt16m_nTransparenceTabPage;
-sal_uInt16m_nColorTabPage;
-sal_uInt16m_nGradientTabPage;
-sal_uInt16m_nHatchTabPage;
-sal_uInt16m_nBitmapTabPage;
-sal_uInt16m_nPatternTabPage;
 
 private:
 SdrModel*   mpDrawModel;
@@ -134,7 +129,9 @@ private:
 ChangeType  mnGradientListState;
 ChangeType  mnHatchingListState;
 
-sal_Int32   mnPos;
+sal_Int16   mnPos;
+PageTypemnPageType;
+boolmbAreaTP;
 
 virtual voidPageCreated( sal_uInt16 nId, SfxTabPage  ) 
override;
 
@@ -255,12 +252,12 @@ private:
 VclPtr m_pBtnPattern;
 ButtonBox  maBox;
 
-SdrModel*   mpDrawModel;
 XColorListRef m_pColorList;
 XGradientListRef  m_pGradientList;
 XHatchListRef m_pHatchingList;
 XBitmapListRefm_pBitmapList;
 XPatternListRef   m_pPatternList;
+SdrModel* mpDrawModel;
 
 // Placeholders for pointer-based entries; these will be inited
 // to point to these so that the page is usable without that
@@ -274,7 +271,11 @@ private:
 ChangeType* m_pnGradientListState;
 ChangeType* m_pnHatchingListState;
 
+PageTypem_nPageType;
 sal_Int32   m_nPos;
+sal_uInt16  m_nDlgType;
+bool*   m_pbAreaTP;
+
 XFillAttrSetItemm_aXFillAttr;
 SfxItemSet& m_rXFSet;
 
@@ -308,13 +309,17 @@ public:
 voidSetBitmapList( XBitmapListRef const & pBmpLst) { m_pBitmapList = 
pBmpLst; }
 voidSetPatternList( XPatternListRef const  ) { m_pPatternList 
= pPtrnLst; }
 voidSetDrawModel( SdrModel* pModel ) { mpDrawModel = pModel; }
-
+voidSetPageType( PageType nInType ) { m_nPageType = nInType; }
+voidSetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
+voidSetPos( sal_uInt16 nInPos ) { m_nPos = nInPos; }
+voidSetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
 virtual void PageCreated(const SfxAllItemSet& aSet) override;
 voidCreatePage(sal_Int32 nId, SfxTabPage& pTab);
 voidSetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
 voidSetGrdChgd( ChangeType* pIn ) { m_pnGradientListState = pIn; }
 voidSetHtchChgd( ChangeType* pIn ) { m_pnHatchingListState = pIn; }
 voidSetBmpChgd( ChangeType* pIn ) { m_pnBitmapListState = pIn; }
+voidSetPtrnChgd( ChangeType* pIn ) { m_pnPatternListState = pIn; }
 };
 
 
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 06acf58..bc88c7d 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -49,12 +49,6 @@ SvxAreaTabDialog::SvxAreaTabDialog
 , m_nAreaTabPage(0)
 , m_nShadowTabPage(0)
 , m_nTransparenceTabPage(0)
-, m_nColorTabPage(0)
-, m_nGradientTabPage(0)
-, m_nHatchTabPage(0)
-//, m_nBitmapTabPage(0)
-, m_nPatternTabPage(0)
-
 , mpDrawModel  ( pModel ),
 mpColorList  ( pModel->GetColorList() ),
 mpNewColorList   ( pModel->GetColorList() ),
@@ -87,11 +81,6 @@ SvxAreaTabDialog::SvxAreaTabDialog
 }
 
 m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", 
SvxTransparenceTabPage::Create,  nullptr);
-m_nColorTabPage = AddTabPage( "RID_SVXPAGE_COLOR", 
SvxColorTabPage::Create, nullptr );
-m_nGradientTabPage = AddTabPage( "RID_SVXPAGE_GRADIENT", 
SvxGradientTabPage::Create, nullptr );
-m_nHatchTabPage = AddTabPage( "RID_SVXPAGE_HATCH", 
SvxHatchTabPage::Create, nullptr );
-m_nBitmapTabPage = AddTabPage( "RID_SVXPAGE_BITMAP", 
SvxBitmapTabPage::Create, SvxBitmapTabPage::GetRanges );
-m_nPatternTabPage = AddTabPage( "RID_SVXPAGE_PATTERN", 
SvxPatternTabPage::Create,  nullptr);
 
 SetCurPageId( "RID_SVXPAGE_AREA" );
 
@@ -233,11 +222,9 @@ void 

[Libreoffice-commits] online.git: loolwsd/LOOLForKit.cpp loolwsd/LOOLKit.cpp loolwsd/LOOLWSD.cpp loolwsd/test

[Tor Lillqvist]

 loolwsd/LOOLForKit.cpp   |   12 ++--
 loolwsd/LOOLKit.cpp  |   13 ++---
 loolwsd/LOOLWSD.cpp  |4 ++--
 loolwsd/test/helpers.hpp |3 ++-
 loolwsd/test/test.cpp|3 ++-
 5 files changed, 18 insertions(+), 17 deletions(-)

New commits:
commit 9fee650f437c58538d6cf486c4e77b5541cba50c
Author: Tor Lillqvist 
Date:   Wed Oct 12 11:47:26 2016 +0300

Use std::getenv() consistently

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 7a38541..735d0d7 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -199,10 +199,10 @@ int main(int argc, char** argv)
 }
 
 // Initialization
-const bool logToFile = getenv("LOOL_LOGFILE");
-const char* logFilename = getenv("LOOL_LOGFILENAME");
-const char* logLevel = getenv("LOOL_LOGLEVEL");
-const char* logColor = getenv("LOOL_LOGCOLOR");
+const bool logToFile = std::getenv("LOOL_LOGFILE");
+const char* logFilename = std::getenv("LOOL_LOGFILENAME");
+const char* logLevel = std::getenv("LOOL_LOGLEVEL");
+const char* logColor = std::getenv("LOOL_LOGCOLOR");
 std::map logProperties;
 if (logToFile && logFilename)
 {
@@ -220,11 +220,11 @@ int main(int argc, char** argv)
 std::string loTemplate;
 
 #if ENABLE_DEBUG
-static const char* clientPort = getenv("LOOL_TEST_CLIENT_PORT");
+static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
 if (clientPort)
 ClientPortNumber = std::stoi(clientPort);
 
-static const char* masterPort = getenv("LOOL_TEST_MASTER_PORT");
+static const char* masterPort = std::getenv("LOOL_TEST_MASTER_PORT");
 if (masterPort)
 MasterPortNumber = std::stoi(masterPort);
 #endif
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 089b695..d0c5826 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -13,15 +13,14 @@
 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1304,10 +1303,10 @@ void lokit_main(const std::string& childRoot,
 bool displayVersion)
 {
 // Reinitialize logging when forked.
-const bool logToFile = getenv("LOOL_LOGFILE");
-const char* logFilename = getenv("LOOL_LOGFILENAME");
-const char* logLevel = getenv("LOOL_LOGLEVEL");
-const char* logColor = getenv("LOOL_LOGCOLOR");
+const bool logToFile = std::getenv("LOOL_LOGFILE");
+const char* logFilename = std::getenv("LOOL_LOGFILENAME");
+const char* logLevel = std::getenv("LOOL_LOGLEVEL");
+const char* logColor = std::getenv("LOOL_LOGCOLOR");
 std::map logProperties;
 if (logToFile && logFilename)
 {
@@ -1370,7 +1369,7 @@ void lokit_main(const std::string& childRoot,
 
 // Copy (link) LO installation and other necessary files into it 
from the template.
 bool bLoopMounted = false;
-if (getenv("LOOL_BIND_MOUNT"))
+if (std::getenv("LOOL_BIND_MOUNT"))
 {
 Path usrSrcPath(sysTemplate, "usr");
 Path usrDestPath(jailPath, "usr");
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 79d1986..ec375ea 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1803,11 +1803,11 @@ void LOOLWSD::handleOption(const std::string& 
optionName,
 else if (optionName == "careerspan")
 careerSpanSeconds = std::stoi(value);
 
-static const char* clientPort = getenv("LOOL_TEST_CLIENT_PORT");
+static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
 if (clientPort)
 ClientPortNumber = std::stoi(clientPort);
 
-static const char* masterPort = getenv("LOOL_TEST_MASTER_PORT");
+static const char* masterPort = std::getenv("LOOL_TEST_MASTER_PORT");
 if (masterPort)
 MasterPortNumber = std::stoi(masterPort);
 #endif
diff --git a/loolwsd/test/helpers.hpp b/loolwsd/test/helpers.hpp
index bed5788..5f5a5c1 100644
--- a/loolwsd/test/helpers.hpp
+++ b/loolwsd/test/helpers.hpp
@@ -10,6 +10,7 @@
 #include "config.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -118,7 +119,7 @@ Poco::Net::HTTPClientSession* createSession(const 
Poco::URI& uri)
 inline
 std::string getTestServerURI()
 {
-static const char* clientPort = getenv("LOOL_TEST_CLIENT_PORT");
+static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
 
 static std::string serverURI(
 #if ENABLE_SSL
diff --git a/loolwsd/test/test.cpp b/loolwsd/test/test.cpp
index d93ccf9..7a081a9 100644
--- a/loolwsd/test/test.cpp
+++ b/loolwsd/test/test.cpp
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
 #include 
 
 #include 
@@ -25,7 +26,7 @@ class HTTPGetTest;
 
 bool filterTests(CPPUNIT_NS::TestRunner& runner, CPPUNIT_NS::Test* 
testRegistry)
 {
-const char* envar = getenv("CPPUNIT_TEST_NAME");
+

[Libreoffice-commits] online.git: loolwsd/PrisonerSession.cpp

[Tor Lillqvist]

 loolwsd/PrisonerSession.cpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 55e6a766393d4e5568f6701692ff38fbd4553183
Author: Tor Lillqvist 
Date:   Mon Oct 10 17:14:06 2016 +0300

If saving fails, tell it to the user VERY VISIBLY

diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index ccedaec..2f08f63 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -86,7 +86,8 @@ bool PrisonerSession::_handleInput(const char *buffer, int 
length)
 result = resultObj->get("value").toString();
 }
 
-_docBroker->save(success, result);
+if (!_docBroker->save(success, result))
+peer->sendTextFrame("error: cmd=internal kind=diskfull");
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sc/inc/formularesult.hxx|8 ++
 sw/inc/pagedesc.hxx |   70 
 sw/qa/extras/uiwriter/uiwriter.cxx  |2 
 sw/source/core/doc/DocumentStylePoolManager.cxx |   16 ++---
 sw/source/core/doc/docdesc.cxx  |2 
 sw/source/core/docnode/node.cxx |4 -
 sw/source/core/edit/autofmt.cxx |2 
 sw/source/core/layout/pagedesc.cxx  |   14 ++--
 sw/source/core/unocore/unostyle.cxx |2 
 sw/source/filter/ww8/docxexport.cxx |2 
 sw/source/filter/ww8/rtfexport.cxx  |4 -
 sw/source/filter/ww8/wrtw8sty.cxx   |   24 
 sw/source/filter/ww8/ww8par.cxx |   10 +--
 sw/source/ui/chrdlg/break.cxx   |8 +-
 sw/source/uibase/app/appenv.cxx |2 
 sw/source/uibase/app/applab.cxx |2 
 sw/source/uibase/uiview/viewmdi.cxx |2 
 sw/source/uibase/uiview/viewtab.cxx |2 
 sw/source/uibase/utlui/uitool.cxx   |   30 +-
 19 files changed, 109 insertions(+), 97 deletions(-)

New commits:
commit a77ff8446e7ed2255b11406b4ccce7ec742d7c67
Author: Noel Grandin 
Date:   Wed Oct 12 11:40:50 2016 +0200

silence gcc4.8 warning

Change-Id: I1e433d6011de22e018b5324754f00065f2bfa6eb

diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 43ff655..9150ab9 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -73,7 +73,15 @@ class ScFormulaResult
 boolmbToken :1; // whether content of union is a token
 boolmbEmpty :1; // empty cell result
 boolmbEmptyDisplayedAsString :1;// only if mbEmpty
+// GCC4.8 complains about 'ScFormulaResult::meMultiline is too small to hold 
all values of enum class ScFormulaResult::Multiline'
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Werror"
+#endif
 Multiline   meMultiline :2; // result is multiline
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic pop
+#endif
 
 /** Reset mnError, mbEmpty and mbEmptyDisplayedAsString to their defaults
 prior to assigning other types */
commit cbd4266beff52cf210f1532b50f8bab74cb8ba8c
Author: Noel Grandin 
Date:   Wed Oct 12 11:34:54 2016 +0200

convert PD_ constants to typed_flags

Change-Id: Ia651dfae33cb1e901f124541a1e12f240d4a7458

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index d234bfc..9e3bd2e 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -27,14 +27,16 @@
 #include 
 #include 
 #include 
-
-using namespace ::com::sun::star;
+#include 
 
 #include 
 #include 
 #include 
 #include 
 
+using namespace ::com::sun::star;
+
+
 class SfxPoolItem;
 class SwTextFormatColl;
 class SwNode;
@@ -121,20 +123,22 @@ public:
  * document (contents are created or removed according to SHARE-information).
  */
 
-typedef sal_uInt16 UseOnPage;
-namespace nsUseOnPage
+enum class UseOnPage : sal_uInt16
 {
-const UseOnPage PD_NONE   = 0x; ///< For internal use only.
-const UseOnPage PD_LEFT   = 0x0001;
-const UseOnPage PD_RIGHT  = 0x0002;
-const UseOnPage PD_ALL= 0x0003;
-const UseOnPage PD_MIRROR = 0x0007;
-const UseOnPage PD_HEADERSHARE= 0x0040;
-const UseOnPage PD_FOOTERSHARE= 0x0080;
-const UseOnPage PD_FIRSTSHARE = 0x0100;
-const UseOnPage PD_NOHEADERSHARE  = 0xFFBF; ///< For internal use only.
-const UseOnPage PD_NOFOOTERSHARE  = 0xFF7F; ///< For internal use only.
-const UseOnPage PD_NOFIRSTSHARE   = 0xFEFF;
+NONE   = 0x, ///< For internal use only.
+Left   = 0x0001,
+Right  = 0x0002,
+All= 0x0003,
+Mirror = 0x0007,
+HeaderShare= 0x0040,
+FooterShare= 0x0080,
+FirstShare = 0x0100,
+NoHeaderShare  = 0xFFBF, ///< For internal use only.
+NoFooterShare  = 0xFF7F, ///< For internal use only.
+NoFirstShare   = 0xFEFF
+};
+namespace o3tl {
+template<> struct typed_flags : is_typed_flags {};
 }
 
 class SW_DLLPUBLIC SwPageDesc : public SwModify
@@ -206,7 +210,7 @@ public:
 bool IsHidden() const { return m_IsHidden; }
 void SetHidden(bool const bValue) { m_IsHidden = bValue; }
 
-/// Same as WriteUseOn(), but the >= PD_HEADERSHARE part of the bitfield 
is not modified.
+/// Same as WriteUseOn(), but the >= HeaderShare part of the bitfield is 
not modified.
 inline void  SetUseOn( UseOnPage eNew );
 inline UseOnPage GetUseOn() const;
 
@@ -296,44 +300,44 @@ inline void SwPageDesc::SetFollow( const SwPageDesc* pNew 
)
 
 inline bool SwPageDesc::IsHeaderShared() const
 {
-return (m_eUse & 

Re: Akshay Nagar license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

rgds
Jan Iversen.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/uiconfig sw/uiconfig

[Federico Bassini]

 cui/uiconfig/ui/securityoptionsdialog.ui |4 ++--
 sw/uiconfig/swriter/ui/tocentriespage.ui |   18 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit a4df89e0fafb3b2991a57c506f137367a117f355
Author: Federico Bassini 
Date:   Wed Oct 12 10:58:46 2016 +0200

tdf#101442 "hyperlink" to "link" - other words change

Changes to be committed:
modified:   cui/uiconfig/ui/securityoptionsdialog.ui
modified:   sw/uiconfig/swriter/ui/tocentriespage.ui

Change-Id: Ie46281b4c15dad634bab870fbe50c749165a001d
Reviewed-on: https://gerrit.libreoffice.org/29727
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui 
b/cui/uiconfig/ui/securityoptionsdialog.ui
index 1262e10..007d075 100644
--- a/cui/uiconfig/ui/securityoptionsdialog.ui
+++ b/cui/uiconfig/ui/securityoptionsdialog.ui
@@ -223,8 +223,8 @@
 True
 False
 True
-0
 Warn if 
document contains recorded changes, versions, hidden information or 
notes:
+0
   
   
 0
@@ -305,7 +305,7 @@
 
 
   
-Ctrl-click required _to follow hyperlinks
+Ctrl-click required _to follow links
 True
 True
 False
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui 
b/sw/uiconfig/swriter/ui/tocentriespage.ui
index 36269d7..a6e8c20 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -165,10 +165,10 @@
   
 True
 False
-0
 _Structure:
 True
 token
+0
   
   
 0
@@ -217,10 +217,10 @@
   
 True
 False
-0
 Character style:
 True
 charstyle
+0
   
   
 0
@@ -256,10 +256,10 @@
   
 True
 False
-0
 Fill 
character:
 True
 fillchar
+0
   
   
 0
@@ -288,10 +288,10 @@
   
 True
 False
-0
 Tab 
stop position:
 True
 tabstoppos:0.00cm
+0
   
   
 0
@@ -332,10 +332,10 @@
   
 True
 False
-0
 Chapter entry:
 True
 chapterentry
+0
   
   
 0
@@ -363,10 +363,10 @@
   
 True
 False
-0
 Evaluate up to level:
 True
 entryoutlinelevel
+0
   
   
 0
@@ -391,10 +391,10 @@
   
 True
 False
-0
 Format:
 True
 numberformat
+0
   
   
 0
@@ -558,7 +558,7 @@
 

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

[Caolán McNamara]

 basctl/inc/basidesh.hrc |5 +++--
 basctl/source/basicide/baside2b.cxx |5 -
 basctl/source/basicide/basidesh.src |   20 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 74ead0785f7a08709cf6da6c24a936001b1a7d9c
Author: Caolán McNamara 
Date:   Wed Oct 12 11:51:06 2016 +0100

de-src solo image button

Change-Id: I82a613c8f371d8f585c53b2625e7dbed8ea0b703

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 2c6..7f21dc6c 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -27,7 +27,7 @@
 #define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
 
-#define RID_IMGBTN_REMOVEWATCH  ( RID_BASICIDE_START +  8 )
+#define RID_IMG_REMOVEWATCH ( RID_BASICIDE_START +  8 )
 #define RID_IMG_INSTALLATION( RID_BASICIDE_START + 20 )
 #define RID_IMG_DOCUMENT( RID_BASICIDE_START + 22 )
 #define RID_IMG_MODLIB  ( RID_BASICIDE_START + 24 )
@@ -103,7 +103,8 @@
 #define RID_STR_SHAREMACROS ( RID_BASICIDE_START + 75 )
 #define RID_STR_SHAREDIALOGS( RID_BASICIDE_START + 76 )
 #define RID_STR_SHAREMACROSDIALOGS  ( RID_BASICIDE_START + 77 )
-//free slots
+//free slot
+#define RID_STR_REMOVEWATCHTIP  ( RID_BASICIDE_START + 79 )
 #define RID_STR_QUERYREPLACEMACRO   ( RID_BASICIDE_START + 80 )
 #define RID_STR_FILENAME( RID_BASICIDE_START + 81 )
 #define RID_STR_APPENDLIBS  ( RID_BASICIDE_START + 82 )
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index ea89aac..d02782e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1563,7 +1563,7 @@ WatchWindow::WatchWindow (Layout* pParent)
 : DockingWindow(pParent)
 , aWatchStr(IDEResId( RID_STR_REMOVEWATCH))
 , aXEdit(VclPtr::Create(this, WB_BORDER | WB_3DLOOK))
-, aRemoveWatchButton(VclPtr::Create(this, 
IDEResId(RID_IMGBTN_REMOVEWATCH)))
+, aRemoveWatchButton(VclPtr::Create(this, WB_SMALLSTYLE))
 , aTreeListBox(VclPtr::Create(this, WB_BORDER | 
WB_3DLOOK | WB_HASBUTTONS |
   WB_HASLINES | 
WB_HSCROLL | WB_TABSTOP |
   WB_HASLINESATROOT | 
WB_HASBUTTONSATROOT))
@@ -1584,6 +1584,9 @@ WatchWindow::WatchWindow (Layout* pParent)
 aRemoveWatchButton->Disable();
 aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
 aRemoveWatchButton->SetPosPixel( Point( nTextLen + 
aXEdit->GetSizePixel().Width() + 4, 2 ) );
+aRemoveWatchButton->SetHelpId(HID_BASICIDE_REMOVEWATCH);
+aRemoveWatchButton->SetModeImage(Image(IDEResId(RID_IMG_REMOVEWATCH)));
+aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP));
 Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() );
 aSz.Width() += 6;
 aSz.Height() += 6;
diff --git a/basctl/source/basicide/basidesh.src 
b/basctl/source/basicide/basidesh.src
index a9d08c3..8a21b54 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -285,16 +285,6 @@ String RID_STR_SEARCHALLMODULES
 {
 Text [ en-US ] = "Do you want to replace the text in all active modules?" ;
 };
-ImageButton RID_IMGBTN_REMOVEWATCH
-{
-HelpId = HID_BASICIDE_REMOVEWATCH ;
-SmallStyle = TRUE ;
-ButtonImage = Image
-{
-ImageBitmap = Bitmap { File = "baswatr.png" ; };
-};
-QuickHelpText [ en-US ] = "Remove Watch" ;
-};
 
 String RID_STR_REMOVEWATCH
 {
@@ -486,6 +476,16 @@ Image RID_IMG_DIALOG
 {
 ImageBitmap = Bitmap { File = "im30823.png"; };
 };
+Image RID_IMG_REMOVEWATCH
+{
+ImageBitmap = Bitmap { File = "baswatr.png" ; };
+};
+
+String RID_STR_REMOVEWATCHTIP
+{
+Text [ en-US ] = "Remove Watch" ;
+};
+
 String RID_STR_QUERYREPLACEMACRO
 {
 Text [ en-US ] = "Do you want to overwrite the XX macro?" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/1.9.4'

[Tor Lillqvist]

Tag '1.9.4' created by Andras Timar  at 2016-10-12 
11:15 +

1.9.4

Changes since 1.9.3-100:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 0bd4ae07ae99bf030a3f775b8e16db58f7d2cdba
Author: Caolán McNamara 
Date:   Wed Oct 12 10:08:31 2016 +0100

Updated core
Project: help  50bab958d34bf90c4b345dbf2b66050fc58538fd

update help ids for impress/draw navigator ui conversion

Change-Id: Id0827a67d46232f519726e5851b8bfdd02880e0c

diff --git a/helpcontent2 b/helpcontent2
index 5d912ed..50bab95 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5d912ed85e9c4103fe37b129a56493c7c3c5
+Subproject commit 50bab958d34bf90c4b345dbf2b66050fc58538fd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/ClientSession.cpp loolwsd/ClientSession.hpp loolwsd/LOOLSession.hpp loolwsd/LOOLWSD.cpp loolwsd/PrisonerSession.cpp loolwsd/PrisonerSession.hpp

[Tor Lillqvist]

 loolwsd/ClientSession.cpp   |4 ++--
 loolwsd/ClientSession.hpp   |2 +-
 loolwsd/LOOLSession.hpp |4 ++--
 loolwsd/LOOLWSD.cpp |   10 +-
 loolwsd/PrisonerSession.cpp |4 ++--
 loolwsd/PrisonerSession.hpp |2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit e07069eda2cecfdf7cc08bbb2c1003a817a2fd0c
Author: Tor Lillqvist 
Date:   Wed Oct 12 13:05:57 2016 +0300

Drop parameter when we always pass the same value for it

For the 'message' parameter of LOOLSession::shutdown(),
ClientSession::shutdownPeer(), and PrisonerSession::shutdownPeer() we
always passed "". It was passed on as the 'statusMessage' parameter to
WebSocet::shutdown() which has "" as default anyway.

diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index 6e8a60e..32a2c1f 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -348,12 +348,12 @@ bool ClientSession::sendCombinedTiles(const char* 
/*buffer*/, int /*length*/, St
 return true;
 }
 
-bool ClientSession::shutdownPeer(Poco::UInt16 statusCode, const std::string& 
message)
+bool ClientSession::shutdownPeer(Poco::UInt16 statusCode)
 {
 auto peer = _peer.lock();
 if (peer && !peer->isCloseFrame())
 {
-peer->shutdown(statusCode, message);
+peer->shutdown(statusCode);
 }
 return peer != nullptr;
 }
diff --git a/loolwsd/ClientSession.hpp b/loolwsd/ClientSession.hpp
index 926d250..ba8d985 100644
--- a/loolwsd/ClientSession.hpp
+++ b/loolwsd/ClientSession.hpp
@@ -31,7 +31,7 @@ public:
 
 void setPeer(const std::shared_ptr& peer) { _peer = peer; 
}
 std::shared_ptr getPeer() const { return _peer.lock(); }
-bool shutdownPeer(Poco::UInt16 statusCode, const std::string& message);
+bool shutdownPeer(Poco::UInt16 statusCode);
 
 void setUserName(const std::string& userName) { _userName = userName; }
 
diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index b07b2c6..11390cc 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -59,11 +59,11 @@ public:
 /// Called to handle disconnection command from socket.
 virtual bool handleDisconnect();
 
-void shutdown(Poco::UInt16 statusCode, const std::string& message)
+void shutdown(Poco::UInt16 statusCode)
 {
 if (_ws)
 {
-_ws->shutdown(statusCode, message);
+_ws->shutdown(statusCode);
 }
 }
 
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 7151e22..cb5e94f 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -507,7 +507,7 @@ private:
 Log::error("Multiple sessions during conversion. " + 
std::to_string(sessionsCount) + " sessions remain.");
 }
 
-session->shutdownPeer(WebSocket::WS_NORMAL_CLOSE, "");
+session->shutdownPeer(WebSocket::WS_NORMAL_CLOSE);
 }
 
 // Clean up the temporary directory the HTMLForm ctor created.
@@ -884,7 +884,7 @@ private:
 if (session->isCloseFrame())
 {
 Log::trace("Normal close handshake.");
-if (session->shutdownPeer(WebSocket::WS_NORMAL_CLOSE, ""))
+if (session->shutdownPeer(WebSocket::WS_NORMAL_CLOSE))
 {
 // Client initiated close handshake
 // respond close frame
@@ -897,7 +897,7 @@ private:
 Log::trace("Abnormal close handshake.");
 session->closeFrame();
 ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY);
-session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY);
 }
 }
 
@@ -1262,7 +1262,7 @@ public:
 if (session->isCloseFrame())
 {
 Log::trace("Normal close handshake.");
-if (session->shutdownPeer(WebSocket::WS_NORMAL_CLOSE, ""))
+if (session->shutdownPeer(WebSocket::WS_NORMAL_CLOSE))
 {
 // LOKit initiated close handshake
 // respond close frame
@@ -1275,7 +1275,7 @@ public:
 Log::trace("Abnormal close handshake.");
 session->closeFrame();
 ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY);
-session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY);
 }
 }
 catch (const Exception& exc)
diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index 2f08f63..b1b5f91 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -254,12 +254,12 @@ bool PrisonerSession::_handleInput(const char *buffer, 
int length)
 return true;
 }
 
-bool PrisonerSession::shutdownPeer(Poco::UInt16 statusCode, const std::string& 
message)
+bool 

[Libreoffice-commits] core.git: 6 commits - include/tools include/vcl rsc/inc rsc/source tools/source vcl/source

[Caolán McNamara]

 include/tools/rc.h |   49 -
 include/tools/rcid.h   |4 
 include/tools/resmgr.hxx   |5 
 include/vcl/dockwin.hxx|1 
 include/vcl/edit.hxx   |2 
 include/vcl/lstbox.hxx |2 
 include/vcl/toolbox.hxx|5 
 include/vcl/window.hxx |4 
 rsc/inc/rscdb.hxx  |4 
 rsc/source/parser/rscicpx.cxx  |  217 -
 rsc/source/parser/rscinit.cxx  |9 -
 tools/source/rc/resmgr.cxx |   65 
 vcl/source/control/button.cxx  |2 
 vcl/source/control/ctrl.cxx|2 
 vcl/source/control/edit.cxx|6 -
 vcl/source/control/fixed.cxx   |4 
 vcl/source/control/listbox.cxx |6 -
 vcl/source/window/dockwin.cxx  |   38 ---
 vcl/source/window/resource.cxx |   22 
 vcl/source/window/toolbox.cxx  |   54 --
 vcl/source/window/toolbox2.cxx |   73 -
 vcl/source/window/window.cxx   |2 
 22 files changed, 20 insertions(+), 556 deletions(-)

New commits:
commit 637587fc8fe4ed3ae7c254fc1dc117bb78f326cb
Author: Caolán McNamara 
Date:   Wed Oct 12 10:42:47 2016 +0100

drop unused argument

Change-Id: I54a86f98289877abc435e2c7397ff5fd6c516545

diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 5aaa9f7..df00e80 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -132,7 +132,7 @@ protected:
 using Window::ImplInit;
 SAL_DLLPRIVATE voidImplInit( vcl::Window* pParent, WinBits nStyle 
);
 SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
-SAL_DLLPRIVATE voidImplLoadRes( const ResId& rResId );
+SAL_DLLPRIVATE voidImplLoadRes();
 SAL_DLLPRIVATE voidImplSetSelection( const Selection& rSelection, 
bool bPaint = true );
 SAL_DLLPRIVATE ControlType ImplGetNativeControlType() const;
 SAL_DLLPRIVATE longImplGetExtraXOffset() const;
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 4f22c06..4c3b3bb 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -107,7 +107,7 @@ protected:
 using Window::ImplInit;
 SAL_DLLPRIVATE voidImplInit( vcl::Window* pParent, WinBits nStyle );
 SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
-SAL_DLLPRIVATE voidImplLoadRes( const ResId& rResId );
+SAL_DLLPRIVATE voidImplLoadRes();
 bool   IsDropDownBox() const { return mpFloatWin != nullptr; }
 
 protected:
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 9b36a55..8563d95 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -635,8 +635,8 @@ protected:
 SAL_DLLPRIVATE bool ImplSetClipFlagOverlapWindows( bool 
bSysObjOnlySmaller = false );
 
 SAL_DLLPRIVATE WinBits  ImplInitRes( const ResId& rResId );
-SAL_DLLPRIVATE WindowResHeader  ImplLoadResHeader( const ResId& rResId 
);
-SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
+SAL_DLLPRIVATE WindowResHeader  ImplLoadResHeader();
+SAL_DLLPRIVATE void ImplLoadRes();
 
 SAL_DLLPRIVATE void PushPaintHelper(PaintHelper* pHelper, 
vcl::RenderContext& rRenderContext);
 SAL_DLLPRIVATE void PopPaintHelper(PaintHelper* pHelper);
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index fc37a34..c5eed69 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1214,7 +1214,7 @@ PushButton::PushButton( vcl::Window* pParent, const 
ResId& rResId ) :
 WinBits nStyle = ImplInitRes( rResId );
 ImplInitPushButtonData();
 ImplInit( pParent, nStyle );
-ImplLoadRes( rResId );
+ImplLoadRes();
 
 if ( !(nStyle & WB_HIDE) )
 Show();
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 2235cd4..c2d697d 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -60,7 +60,7 @@ Control::Control( vcl::Window* pParent, const ResId& rResId ) 
:
 rResId.SetRT( RSC_CONTROL );
 WinBits nStyle = ImplInitRes( rResId );
 ImplInit( pParent, nStyle, nullptr );
-ImplLoadRes( rResId );
+ImplLoadRes();
 
 if ( !(nStyle & WB_HIDE) )
 Show();
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index dbb6a76..2769a0f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -176,7 +176,7 @@ Edit::Edit( vcl::Window* pParent, const ResId& rResId )
 WinBits nStyle = ImplInitRes( rResId );
 ImplInitEditData();
 ImplInit( pParent, nStyle );
-ImplLoadRes( rResId );
+ImplLoadRes();
 
 if ( !(nStyle & WB_HIDE) )
 Show();
@@ -1279,9 +1279,9 @@ void Edit::ImplSetCursorPos( sal_Int32 nChar, bool 
bSelect )
 ImplSetSelection( aSelection );
 }
 
-void Edit::ImplLoadRes( const ResId& rResId )
+void Edit::ImplLoadRes()
 {
-Control::ImplLoadRes( 

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

[Katarina Behrens]

 cui/source/tabpages/tppattern.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 0d93900801224b797741e9a1abf305109fa35665
Author: Katarina Behrens 
Date:   Sat Oct 8 00:04:19 2016 +0200

Avoid crash on switching to pattern tab

Change-Id: I8edeb1a92c20c88160109a904cdcec355a5ef998
Reviewed-on: https://gerrit.libreoffice.org/29599
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/tabpages/tppattern.cxx 
b/cui/source/tabpages/tppattern.cxx
index 7c73b3a..c156d24 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -73,7 +73,7 @@ public:
 {
 const Bitmap aRetval(createHistorical8x8FromArray(pBmpArray, 
aPixelColor, aBackgroundColor));
 
-return BitmapEx(aRetval);
+return (pBmpArray != nullptr) ? BitmapEx(aRetval) : BitmapEx();
 }
 
 void SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; }
@@ -201,7 +201,6 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& 
rSet )
 m_pLbBackgroundColor->SelectEntryPos( 0 );
 else
 m_pLbBackgroundColor->SelectEntryPos( nPos );
-ChangeColor_Impl();
 }
 
 // determining (possibly cutting) the name and
@@ -226,8 +225,6 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& 
rSet )
 sal_uInt16 nId = m_pPatternLB->GetItemId( static_cast( 
*m_pPos ) );
 m_pPatternLB->SelectItem( nId );
 }
-// colors could have been deleted
-ChangePatternHdl_Impl( m_pPatternLB );
 
 *m_pPos = LISTBOX_ENTRY_NOTFOUND;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 cui/source/tabpages/tparea.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b44a8186da2270ef7d120b97380aabc297be76b
Author: Katarina Behrens 
Date:   Wed Oct 12 10:44:37 2016 +0200

Enlarge tabpage size so that even colour tab fits in

Change-Id: Ic768000d6710b14d117a3480a13c39efe9e330ea
Reviewed-on: https://gerrit.libreoffice.org/29725
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index c9b66a1..bfd5a4b 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -120,8 +120,8 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const 
SfxItemSet& rInAttrs
 m_pBtnBitmap->SetClickHdl(aLink);
 m_pBtnPattern->SetClickHdl(aLink);
 
-m_pFillTab->set_width_request(700);
-m_pFillTab->set_height_request(400);
+m_pFillTab->set_width_request(750);
+m_pFillTab->set_height_request(550);
 }
 
 SvxAreaTabPage::~SvxAreaTabPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cui/source/inc/cuitabarea.hxx|1 -
 cui/source/tabpages/tpbitmap.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 7034589b105f5530bb396db988c39b90944ffedc
Author: Stephan Bergmann 
Date:   Wed Oct 12 11:13:59 2016 +0200

-Werror,-Wunused-private-field, again

Change-Id: I1f1ab1e3fd1360111a48d68effd254277e220843

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 2d612b3..21a8fb3 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -576,7 +576,6 @@ private:
 SfxItemSet&m_rXFSet;
 const SdrView* mpView;
 MapUnitmePoolUnit;
-FieldUnit  meDlgUnit;
 Size   rBitmapSize;
 Size   rFilledSize;
 Size   rZoomedSize;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index a462892..19b5db0 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -89,7 +89,6 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, 
const SfxItemSet& rInA
 m_aXFillAttr  ( rInAttrs.GetPool() ),
 m_rXFSet  ( m_aXFillAttr.GetItemSet() ),
 mpView(nullptr),
-meDlgUnit(GetModuleFieldUnit( GetItemSet() )),
 nFilledWidthPercent(0),
 nFilledHeightPercent(0),
 nZoomedWidthPercent(0),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst |   12 
 source/text/simpress/01/0211.xhp |   35 +--
 2 files changed, 17 insertions(+), 30 deletions(-)

New commits:
commit 50bab958d34bf90c4b345dbf2b66050fc58538fd
Author: Caolán McNamara 
Date:   Wed Oct 12 10:08:31 2016 +0100

update help ids for impress/draw navigator ui conversion

Change-Id: Id0827a67d46232f519726e5851b8bfdd02880e0c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e9a1dac..b46370f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2595,17 +2595,6 @@ HID_SD_HTMLEXPORT_PAGE6,59878,
 HID_SD_NAMEDIALOG_LINEEND,59898,
 HID_SD_NAMEDIALOG_OBJECT,59896,
 HID_SD_NAMEDIALOG_PAGE,59897,
-HID_SD_NAVIGATOR,59794,
-HID_SD_NAVIGATOR_LB,59799,
-HID_SD_NAVIGATOR_TBI_DRAGTYPE,59806,
-HID_SD_NAVIGATOR_TBI_FIRST,59802,
-HID_SD_NAVIGATOR_TBI_LAST,59805,
-HID_SD_NAVIGATOR_TBI_NEXT,59804,
-HID_SD_NAVIGATOR_TBI_PEN,59801,
-HID_SD_NAVIGATOR_TBI_PREV,59803,
-HID_SD_NAVIGATOR_TBI_SHAPE_FILTER,59807,
-HID_SD_NAVIGATOR_TBX,59798,
-HID_SD_NAVIGATOR_TLB,59793,
 HID_SD_OPTIONS_LAYOUT,59788,
 HID_SD_OPTIONS_SNAP,59769,
 HID_SD_RECENT_MASTERS,59907,
@@ -2627,7 +2616,6 @@ HID_SD_TASK_PANE_VIEW_MENU,59941,
 HID_SD_TEXT_TOOLBOX,59817,
 HID_SD_UNDODELETEWARNING_CBX,59894,
 HID_SD_UNDODELETEWARNING_DLG,59893,
-HID_SD_WIN_DOCUMENT,59787,
 HID_SD_WIN_PRESENTATION,59836,
 HID_SECTION_FTNENDNOTES_PAGE,53249,
 HID_SELECTTABLES,59000,
diff --git a/source/text/simpress/01/0211.xhp 
b/source/text/simpress/01/0211.xhp
index 871d4d9..caa1272 100644
--- a/source/text/simpress/01/0211.xhp
+++ b/source/text/simpress/01/0211.xhp
@@ -34,9 +34,8 @@
 presentations; navigating
 
 
-
-Navigator
-Opens the Navigator, where you can 
quickly jump to other slides or move between open files.
+Navigator
+Opens 
the Navigator, where you can quickly jump to other slides or move between open 
files.
 
 You can dock the Navigator to the edge of your workspace.
 
@@ -57,8 +56,8 @@
 
 
 
-First Slide
-Jumps to the first slide in 
the slide show.
+First Slide
+Jumps to the 
first slide in the slide show.
 
 
 
@@ -71,8 +70,8 @@
 
 
 
-Previous Slide
-Moves back one slide in the 
slide show.
+Previous Slide
+Moves back 
one slide in the slide show.
 
 
 
@@ -85,8 +84,8 @@
 
 
 
-Next Slide
-Move forward one slide in 
the slide show.
+Next Slide
+Move forward 
one slide in the slide show.
 
 
 
@@ -99,8 +98,8 @@
 
 
 
-Last Slide
-Jumps to the last slide in 
the slide show.
+Last Slide
+Jumps to the 
last slide in the slide show.
 
 
 
@@ -113,8 +112,8 @@
 
 
 
-Drag Mode
-Drag and drop slides and 
named objects into the active slide. You can only insert slides and 
named objects from a saved file. You can only insert named objects as 
copies.
+Drag Mode
+Drag and 
drop slides and named objects into the active slide. You can only 
insert slides and named objects from a saved file. You can only insert named 
objects as copies.
 
 
 
@@ -153,11 +152,11 @@
 Inserts slides as a link into 
the active slide.
 Insert as copy
 Inserts a copy of a slide or named object into the active 
slide.
-Show Shapes
+Show Shapes
 In the submenu you can choose to display a list of 
all shapes or only the named shapes. Use drag-and-drop in the list to reorder 
the shapes. When you set the focus to a slide and press the Tab key, the next shape in the defined order is 
selected.
-Existing Slides
-Lists available slides. 
Double-click a slide to make it the active slide.
-Open Documents
-Lists available $[officename] 
files. Select a file to display the contents you can insert.
+Existing Slides
+Lists 
available slides. Double-click a slide to make it the active 
slide.
+Open Documents
+Lists 
available $[officename] files. Select a file to display the contents 
you can insert.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp

[Tor Lillqvist]

 loolwsd/LOOLWSD.cpp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4b5561c9b4aa7605f15956fe5b91417bac3a261e
Author: Tor Lillqvist 
Date:   Wed Oct 12 12:51:06 2016 +0300

"" is the default value for the WebSocket::shutdown() statusMessage 
parameter

So no need to pass it.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ec375ea..7151e22 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -203,7 +203,7 @@ void shutdownLimitReached(WebSocket& ws)
 if (--retries == 4)
 {
 ws.sendFrame(error.data(), error.size());
-ws.shutdown(WebSocket::WS_POLICY_VIOLATION, "");
+ws.shutdown(WebSocket::WS_POLICY_VIOLATION);
 }
 }
 while (retries > 0 && (flags & WebSocket::FRAME_OP_BITMASK) != 
WebSocket::FRAME_OP_CLOSE);
@@ -211,7 +211,7 @@ void shutdownLimitReached(WebSocket& ws)
 catch (Exception&)
 {
 ws.sendFrame(error.data(), error.size());
-ws.shutdown(WebSocket::WS_POLICY_VIOLATION, "");
+ws.shutdown(WebSocket::WS_POLICY_VIOLATION);
 }
 }
 
@@ -896,7 +896,7 @@ private:
 // something wrong, with internal exceptions
 Log::trace("Abnormal close handshake.");
 session->closeFrame();
-ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY);
 session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
 }
 }
@@ -1049,7 +1049,7 @@ public:
 const std::string msg = std::string("error: ") + 
exc.what();
 ws->sendFrame(msg.data(), msg.size());
 // abnormal close frame handshake
-ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY);
 }
 catch (const std::exception& exc2)
 {
@@ -1274,7 +1274,7 @@ public:
 // something wrong, with internal exceptions
 Log::trace("Abnormal close handshake.");
 session->closeFrame();
-ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY);
 session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - desktop/source include/sfx2 sfx2/Library_sfx.mk sfx2/source svx/source

[Samuel Mehrbrodt]

 desktop/source/app/app.cxx   |3 +
 include/sfx2/safemode.hxx|   52 ++
 sfx2/Library_sfx.mk  |1 
 sfx2/source/appl/appserv.cxx |2 +
 sfx2/source/safemode/safemode.cxx|   59 +++
 svx/source/dialog/SafeModeDialog.cxx |   10 +
 svx/source/dialog/SafeModeDialog.hxx |2 +
 svx/source/dialog/crashreportdlg.cxx |3 +
 8 files changed, 129 insertions(+), 3 deletions(-)

New commits:
commit 2811e4215abb998ebea65512d8dcd86697e3301e
Author: Samuel Mehrbrodt 
Date:   Wed Oct 12 11:18:08 2016 +0200

Delete the safemode flag when closing the dialog

Change-Id: I7131849cc417155b55425eba1494992f7d07fa0b

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index 0553436..549a62f 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -46,6 +46,14 @@ void SafeModeDialog::dispose()
 Dialog::dispose();
 }
 
+bool SafeModeDialog::Close()
+{
+// Remove the safe mode flag before exiting this dialog
+sfx2::SafeMode::removeFlag();
+
+return Dialog::Close();
+}
+
 IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void)
 {
 if (pBtn == mpBtnContinue.get())
@@ -60,7 +68,6 @@ IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void)
 {
 Close();
 }
-sfx2::SafeMode::removeFlag();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeModeDialog.hxx 
b/svx/source/dialog/SafeModeDialog.hxx
index ac71cf4..41acc1f 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -26,6 +26,8 @@ public:
 
 virtual void dispose() override;
 
+virtual bool Close() override;
+
 private:
 
 VclPtr mpBtnContinue;
commit d69006657512a5d23b03c69d89b378f47fa5c521
Author: Samuel Mehrbrodt 
Date:   Wed Oct 12 10:43:55 2016 +0200

Fix writing the flag file

Change-Id: Id2eef64b52ac0f7c48dc090ed3ce41f5cde6b775

diff --git a/sfx2/source/safemode/safemode.cxx 
b/sfx2/source/safemode/safemode.cxx
index a5669d1..3e84f7e 100644
--- a/sfx2/source/safemode/safemode.cxx
+++ b/sfx2/source/safemode/safemode.cxx
@@ -45,11 +45,12 @@ bool SafeMode::removeFlag()
 
 OUString SafeMode::getFileName()
 {
-OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/safemode");
+OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/");
 rtl::Bootstrap::expandMacros(url);
 
 OUString aProfilePath;
 FileBase::getSystemPathFromFileURL(url, aProfilePath);
+FileBase::getAbsoluteFileURL(url, "safemode", aProfilePath);
 return aProfilePath;
 }
 
commit a1261b63f22b8d9d7b134137d1252b6b28dea35c
Author: Samuel Mehrbrodt 
Date:   Wed Oct 12 10:42:47 2016 +0200

Safemode: Add doxygen documentation

Change-Id: Ic5a7f5dfcefe66c961c9b71e9dbdfefeb9f06825

diff --git a/include/sfx2/safemode.hxx b/include/sfx2/safemode.hxx
index 666d2d4..03f8590 100644
--- a/include/sfx2/safemode.hxx
+++ b/include/sfx2/safemode.hxx
@@ -19,9 +19,29 @@ namespace sfx2 {
 class SFX2_DLLPUBLIC SafeMode
 {
 public:
+/**
+ * Write a flag file to the user profile indicating that the next launch 
should be in safe mode.
+ *
+ * @return Whether the file could be written successfully
+ */
 static bool putFlag();
+
+/**
+ * Check the existence of the safe mode flag file.
+ *
+ * @return Whether the flag file for the safe mode exists
+ */
 static bool hasFlag();
+
+/**
+ * Remove the flag file for the safe mode.
+ *
+ * @return Whether the flag file could be removed successfully
+ */
 static bool removeFlag();
+
+private:
+/** Returns the path of the safe mode flag file.*/
 static OUString getFileName();
 };
 
commit b3b9ae6c6fd19b437a5414489a9f38fb310a2843
Author: Samuel Mehrbrodt 
Date:   Tue Oct 11 16:07:37 2016 +0200

safemode: Add flag to indicate safemode

Change-Id: Ifdbb291715b033eaace159297eac5348530e9f36

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a9d10c3..69da758 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -101,6 +101,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2138,7 +2139,7 @@ void Desktop::OpenClients()
 bool bAllowRecoveryAndSessionManagement = ( !rArgs.IsNoRestore() ) && ( 
!rArgs.IsHeadless()  );
 
 // Enter safe mode if requested
-if (rArgs.IsSafeMode())
+if (rArgs.IsSafeMode() || sfx2::SafeMode::hasFlag())
 handleSafeMode();
 
 
diff --git a/include/sfx2/safemode.hxx b/include/sfx2/safemode.hxx
new file mode 100644
index 000..666d2d4
--- /dev/null
+++ b/include/sfx2/safemode.hxx
@@ -0,0 +1,32 @@
+/* -*- Mode: 

[Libreoffice-commits] online.git: 2 commits - loolwsd/Log.cpp loolwsd/LOOLForKit.cpp

[Tor Lillqvist]

 loolwsd/LOOLForKit.cpp |   72 +
 loolwsd/Log.cpp|2 -
 2 files changed, 73 insertions(+), 1 deletion(-)

New commits:
commit d0c856c535c3e2fca382a494e1c6f516e043e93a
Author: Tor Lillqvist 
Date:   Wed Oct 12 14:19:42 2016 +0300

Verify at run-time that the loolforkit program has the required capabilities

If not, log a mesage and exit.

Note that loolwsd does not notice that loolforkit exits. That is
obviously a problem, and I will see to that next.

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 735d0d7..4dc7b3a 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -109,6 +109,75 @@ public:
 }
 };
 
+static bool haveCapability(cap_value_t capability)
+{
+cap_t caps = cap_get_proc();
+
+if (caps == nullptr)
+{
+Log::syserror("cap_get_proc() failed.");
+return false;
+}
+
+char *cap_name = cap_to_name(capability);
+cap_flag_value_t value;
+
+if (cap_get_flag(caps, capability, CAP_EFFECTIVE, ) == -1)
+{
+if (cap_name)
+{
+Log::syserror("cap_get_flag failed for " + std::string(cap_name) + 
".");
+cap_free(cap_name);
+}
+else
+{
+Log::syserror("cap_get_flag failed for capability " + 
std::to_string(capability) + ".");
+}
+return false;
+}
+
+if (value != CAP_SET)
+{
+if (cap_name)
+{
+Log::error("Capability " + std::string(cap_name) + " is not set 
for the loolkit program.");
+cap_free(cap_name);
+}
+else
+{
+Log::error("Capability " + std::to_string(capability) + " is not 
set for the loolkit program.");
+}
+return false;
+}
+
+if (cap_name)
+{
+Log::info("Have capability " + std::string(cap_name));
+cap_free(cap_name);
+}
+else
+{
+Log::info("Have capability " + std::to_string(capability));
+}
+
+return true;
+}
+
+static bool haveCorrectCapabilities()
+{
+bool result = true;
+
+// Do check them all, don't shortcut with &&
+if (!haveCapability(CAP_SYS_CHROOT))
+result = false;
+if (!haveCapability(CAP_MKNOD))
+result = false;
+if (!haveCapability(CAP_SYS_CHROOT))
+result = false;
+
+return result;
+}
+
 /// Check if some previously forked kids have died.
 static void cleanupChildren()
 {
@@ -211,6 +280,9 @@ int main(int argc, char** argv)
 
 Log::initialize("frk", logLevel ? logLevel : "", logColor != nullptr, 
logToFile, logProperties);
 
+if (!haveCorrectCapabilities())
+return Application::EXIT_SOFTWARE;
+
 Util::setTerminationSignals();
 Util::setFatalSignals();
 
commit 07354f6f45107f74677e4ce25ecdd38702eed3cd
Author: Tor Lillqvist 
Date:   Wed Oct 12 14:12:38 2016 +0300

'syserror' does not correspond to a message priority level

Calling Log::syserror() just means errno is relevant and its string
should be included in the log line. It is the error() function of the
logger that it calls.

So don't mark log lines produced by calling Log::syserror() with a
separate "SYS" marker, but use the same "ERR" as for Log::error().

diff --git a/loolwsd/Log.cpp b/loolwsd/Log.cpp
index 1707f65..9885d9f 100644
--- a/loolwsd/Log.cpp
+++ b/loolwsd/Log.cpp
@@ -184,7 +184,7 @@ namespace Log
 
 void syserror(const std::string& msg)
 {
-logger().error(prefix("SYS") + msg + " (errno: " + 
std::string(std::strerror(errno)) + ")");
+logger().error(prefix("ERR") + msg + " (errno: " + 
std::string(std::strerror(errno)) + ")");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - sc/inc sd/source svl/source sw/inc sw/source

[Noel Grandin]

 sc/inc/formularesult.hxx|2 
 sd/source/ui/animations/CustomAnimationDialog.cxx   |   88 
 sd/source/ui/animations/CustomAnimationPane.cxx |   52 -
 sd/source/ui/animations/STLPropertySet.cxx  |8 -
 sd/source/ui/animations/STLPropertySet.hxx  |   18 +--
 sd/source/ui/inc/tools/IdleDetection.hxx|   62 ++-
 sd/source/ui/sidebar/MasterPageContainerQueue.cxx   |6 -
 sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx   |4 
 sd/source/ui/tools/IdleDetection.cxx|   24 ++--
 svl/source/items/poolio.cxx |8 -
 sw/inc/SwGetPoolIdFromName.hxx  |   21 +--
 sw/inc/docstyle.hxx |3 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |2 
 sw/source/core/doc/SwStyleNameMapper.cxx|   36 +++---
 sw/source/core/doc/doclay.cxx   |4 
 sw/source/core/doc/doctxm.cxx   |2 
 sw/source/core/doc/number.cxx   |2 
 sw/source/core/docnode/ndnotxt.cxx  |2 
 sw/source/core/docnode/node.cxx |4 
 sw/source/core/fields/expfld.cxx|4 
 sw/source/core/fields/reffld.cxx|4 
 sw/source/core/frmedt/fedesc.cxx|2 
 sw/source/core/layout/atrfrm.cxx|2 
 sw/source/core/para/paratr.cxx  |6 -
 sw/source/core/text/EnhancedPDFExportHelper.cxx |8 -
 sw/source/core/tox/ToxLinkProcessor.cxx |2 
 sw/source/core/txtnode/fmtatr2.cxx  |   18 +--
 sw/source/core/txtnode/ndtxt.cxx|4 
 sw/source/core/unocore/SwXTextDefaults.cxx  |2 
 sw/source/core/unocore/unocrsrhelper.cxx|6 -
 sw/source/core/unocore/unofield.cxx |4 
 sw/source/core/unocore/unoframe.cxx |8 -
 sw/source/core/unocore/unoidx.cxx   |   26 ++--
 sw/source/core/unocore/unoobj.cxx   |   12 +-
 sw/source/core/unocore/unosett.cxx  |   40 +++
 sw/source/core/unocore/unostyle.cxx |   48 
 sw/source/core/unocore/unotbl.cxx   |6 -
 sw/source/filter/ww8/writerhelper.cxx   |5 
 sw/source/filter/ww8/ww8par5.cxx|4 
 sw/source/filter/xml/xmlfmt.cxx |4 
 sw/source/filter/xml/xmlfmte.cxx|2 
 sw/source/ui/chrdlg/chardlg.cxx |4 
 sw/source/ui/dbui/dbinsdlg.cxx  |2 
 sw/source/ui/index/cnttab.cxx   |2 
 sw/source/uibase/app/docst.cxx  |6 -
 sw/source/uibase/app/docstyle.cxx   |   78 +++---
 sw/source/uibase/shells/txtattr.cxx |4 
 sw/source/uibase/uiview/viewdlg2.cxx|2 
 sw/source/uibase/uno/unotxdoc.cxx   |2 
 sw/source/uibase/uno/unotxvw.cxx|6 -
 sw/source/uibase/utlui/uitool.cxx   |4 
 sw/source/uibase/wrtsh/wrtsh1.cxx   |4 
 52 files changed, 343 insertions(+), 336 deletions(-)

New commits:
commit da01e9ec5dfb7787b4a3669486b3940590933850
Author: Noel Grandin 
Date:   Wed Oct 12 10:10:39 2016 +0200

gcc4.8 does not seem to like explicit-width-scoped-enum and bitfield member

there is a field a little lower down declared as
   Multiline   meMultiline :2;
which gcc gets unhappy about

Change-Id: I3681d566181b6739a222898fe32af13accdf0d43

diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 40b7925..43ff655 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -47,7 +47,7 @@ struct FormulaResultValue
 and memory consumption. */
 class ScFormulaResult
 {
-enum class Multiline : sal_uInt8 {
+enum class Multiline {
 Unknown, False, True
 };
 // Clone token if the 16-bit only reference counter is nearing it's
commit ed3a4fcc878e8f3ce720520d60448bc962da0754
Author: Noel Grandin 
Date:   Wed Oct 12 09:59:06 2016 +0200

convert GET_POOLID constants to scoped enum

Change-Id: Ifc54789d12d0b024ed28f13ec78b5c10afa902de

diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx
index 57e2802..820d864 100644
--- a/sw/inc/SwGetPoolIdFromName.hxx
+++ b/sw/inc/SwGetPoolIdFromName.hxx
@@ -22,18 +22,15 @@
 /* When using the NameMapper to translate pool ids to UI or programmatic
  * names, this enum is used to define which family is required */
 

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

[Stephan Bergmann]

 comphelper/source/misc/backupfilehelper.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8576c5145349ce27e59f6a6a04f8fd23a1dae971
Author: Stephan Bergmann 
Date:   Wed Oct 12 10:55:53 2016 +0200

Missing include

Change-Id: I5abde663d639278bcc8374da6b5772b58a9b7a75

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index 5270306..8b842de 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 source/text/scalc/01/04060184.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2d1ceeaf543b74c76042bd714be1b1eed2adba6d
Author: Eike Rathke 
Date:   Wed Oct 12 13:02:56 2016 +0200

fix typo, s/Number 0/Number30/

Change-Id: I32b5f02e4732bea036e4ca76f24f6ffe85dc0736

diff --git a/source/text/scalc/01/04060184.xhp 
b/source/text/scalc/01/04060184.xhp
index d517a3f..e5cc06d 100644
--- a/source/text/scalc/01/04060184.xhp
+++ b/source/text/scalc/01/04060184.xhp
@@ -142,7 +142,7 @@ oldref="35">AVERAGE
 Syntax
 AVERAGE(Number1; Number2; ...Number30)
-Number1; Number2;...Number 0 are numerical values or 
ranges.
+Number1; Number2;...Number30 are numerical values or 
ranges.
 Example
 
@@ -550,4 +550,4 @@ oldref="136">Example
 
 
 
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Rishabh Kumar]

 cui/source/dialogs/sdrcelldlg.cxx |4 
 cui/source/inc/cuitabarea.hxx |  181 +++
 cui/source/tabpages/tabarea.cxx   |   34 -
 cui/source/tabpages/tparea.cxx|  971 +-
 cui/source/tabpages/tpbitmap.cxx  |  148 ++---
 cui/source/tabpages/tpcolor.cxx   |  108 ++--
 cui/source/tabpages/tpgradnt.cxx  |  222 +---
 cui/source/tabpages/tphatch.cxx   |  161 ++
 cui/source/tabpages/tppattern.cxx |  205 +++-
 cui/uiconfig/ui/areatabpage.ui|  283 +++
 10 files changed, 873 insertions(+), 1444 deletions(-)

New commits:
commit 686349476e03f951f4a9ff9755b9f71951b64ea5
Author: Rishabh Kumar 
Date:   Mon Aug 22 16:48:05 2016 +0530

[GSoC] Move all fill style tabs inside area tab

Change-Id: I89e84b7b3c7075ad4107e7bc444ea5c07bc90795
Reviewed-on: https://gerrit.libreoffice.org/27866
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/dialogs/sdrcelldlg.cxx 
b/cui/source/dialogs/sdrcelldlg.cxx
index 3fd53db..d6e9244 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -51,10 +51,6 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, 
SfxTabPage  )
 rAreaPage.SetGradientList( mpGradientList );
 rAreaPage.SetHatchingList( mpHatchingList );
 rAreaPage.SetBitmapList( mpBitmapList );
-rAreaPage.SetPageType( PageType::Area );
-rAreaPage.SetDlgType( 1 );
-rAreaPage.SetPos( 0 );
-rAreaPage.Construct();
 rAreaPage.ActivatePage( mrOutAttrs );
 }
 else if (nId == m_nBorderPageId)
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 0c103cc..7f1decb 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -35,9 +35,60 @@
 #include 
 #include 
 
+#define NO_BUTTON_SELECTED -1
+
 class SdrModel;
 class SvxBitmapCtl;
 
+//
+class ButtonBox
+{
+private:
+sal_Int32 mnCurrentButton;
+std::vector< VclPtr > maButtonList;
+std::map< VclPtr, sal_Int32 > maButtonToPos;
+void SelectButtonImpl( sal_Int32 nPos )
+{
+if(mnCurrentButton != NO_BUTTON_SELECTED)
+{
+maButtonList[mnCurrentButton]->SetPressed(false);
+}
+mnCurrentButton = nPos;
+maButtonList[mnCurrentButton]->SetPressed(true);
+};
+public:
+ButtonBox()
+{
+mnCurrentButton = NO_BUTTON_SELECTED;
+};
+~ButtonBox() {};
+void AddButton(VclPtr pButton)
+{
+maButtonList.push_back(pButton);
+maButtonToPos.insert( std::make_pair(pButton, maButtonList.size() 
- 1) );
+}
+sal_Int32 GetCurrentButtonPos() { return mnCurrentButton; }
+sal_Int32 GetButtonPos( VclPtr pButton )
+{
+std::map< VclPtr, sal_Int32 >::const_iterator aBtnPos 
= maButtonToPos.find(pButton);
+if(aBtnPos != maButtonToPos.end())
+return aBtnPos->second;
+else
+return -1;
+}
+void SelectButton( VclPtr pButton)
+{
+sal_Int32 nPos = GetButtonPos(pButton);
+if(nPos != -1)
+SelectButtonImpl(nPos);
+}
+void clear()
+{
+mnCurrentButton = NO_BUTTON_SELECTED;
+maButtonList.clear();
+};
+};
+
 enum class PageType
 {
 Area,
@@ -47,12 +98,9 @@ enum class PageType
 Color,
 Shadow,
 Transparence,
-Unknown = 0x
+Unknown = 0xFFF
 };
 
-
-//
-
 class SvxAreaTabDialog : public SfxTabDialog
 {
 sal_uInt16m_nAreaTabPage;
@@ -86,9 +134,7 @@ private:
 ChangeType  mnGradientListState;
 ChangeType  mnHatchingListState;
 
-PageTypemnPageType;
 sal_Int32   mnPos;
-boolmbAreaTP;
 
 virtual voidPageCreated( sal_uInt16 nId, SfxTabPage  ) 
override;
 
@@ -199,74 +245,57 @@ class SvxAreaTabPage : public SvxTabPage
 using TabPage::DeactivatePage;
 static const sal_uInt16 pAreaRanges[];
 private:
-VclPtrm_pTypeLB;
-
-VclPtr m_pFillLB;
-VclPtrm_pLbColor;
-VclPtr m_pLbGradient;
-VclPtr m_pLbHatching;
-VclPtr   m_pLbBitmap;
-VclPtrm_pCtlBitmapPreview;
-VclPtrm_pCtlXRectPreview;
-
-const SfxItemSet&   m_rOutAttrs;
+ScopedVclPtr   m_pFillTabPage;
+VclPtr m_pFillTab;
+VclPtr m_pBtnNone;
+VclPtr m_pBtnColor;
+VclPtr m_pBtnGradient;
+VclPtr m_pBtnHatch;
+VclPtr m_pBtnBitmap;
+VclPtr m_pBtnPattern;
+ButtonBox

Fwd: Filippo Giacchè license statement

[Jan Iversen]

ups forgot reply all.
jan

> Begin forwarded message:
> 
> From: Jan Iversen 
> Subject: Re: Filippo Giacchè license statement
> Date: 12 October 2016 at 10:49:48 GMT+2
> To: Filippo giacchè 
> 
> WELCOME
> Thanks for your license statement.
> 
> I have added you to our wiki:
> https://wiki.documentfoundation.org/Development/Developers 
> 
> 
> If you want help to get started or have any questions, then please contact 
> me. I am here to help you (and others) in getting their first patch submitted.
> 
> LibreOffice is a very big program and getting it built, setting up gerrit, 
> and getting the first patch right can be a bit challenging, therefore do not 
> hesitate to email me if you want help.
> 
> We have made a step by step guide to help you get started:
> https://wiki.documentfoundation.org/Development/GetInvolved 
> 
> 
> rgds
> Jan Iversen.

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

Re: Tamsil Amani license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

rgds
Jan Iversen.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_simpress.mk

[Caolán McNamara]

 sd/AllLangResTarget_sd.mk |1 
 sd/UIConfig_simpress.mk   |1 
 sd/inc/helpids.h  |   11 -
 sd/source/ui/app/res_bmp.src  |   24 ++
 sd/source/ui/app/strings.src  |5 
 sd/source/ui/dlg/NavigatorChildWindow.cxx |5 
 sd/source/ui/dlg/navigatr.cxx |  330 ++
 sd/source/ui/dlg/navigatr.src |  131 ---
 sd/source/ui/dlg/sdtreelb.cxx |   31 --
 sd/source/ui/inc/navigatr.hrc |   37 ---
 sd/source/ui/inc/navigatr.hxx |   12 -
 sd/source/ui/inc/res_bmp.hrc  |4 
 sd/source/ui/inc/sdtreelb.hxx |3 
 sd/source/ui/inc/strings.hrc  |3 
 sd/source/ui/sidebar/NavigatorWrapper.cxx |1 
 sd/uiconfig/simpress/ui/navigatorpanel.ui |  155 ++
 16 files changed, 316 insertions(+), 438 deletions(-)

New commits:
commit 4dc6e29dd6c531dc9c867bc75ef0128a78d99f33
Author: Caolán McNamara 
Date:   Tue Oct 11 20:34:32 2016 +0100

convert impress/draw navigator to .ui

Change-Id: I75164f6878f53dc1382f3802b594914b1637e545

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 673a842..60e2004 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/app/sdstring.src \
 sd/source/ui/app/strings.src \
 sd/source/ui/app/toolbox.src \
-sd/source/ui/dlg/navigatr.src \
 sd/source/ui/slideshow/slideshow.src \
 sd/source/ui/view/DocumentRenderer.src \
 ))
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 6232d5f..160d3a3 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -120,6 +120,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/interactiondialog \
sd/uiconfig/simpress/ui/interactionpage \
sd/uiconfig/simpress/ui/masterlayoutdlg \
+   sd/uiconfig/simpress/ui/navigatorpanel \
sd/uiconfig/simpress/ui/notebookbar \
sd/uiconfig/simpress/ui/optimpressgeneralpage \
sd/uiconfig/simpress/ui/photoalbum \
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index fdc48b2..a65f356 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -23,17 +23,6 @@
 #define HID_SDDRAWVIEWSHELL 
"SD_HID_SDDRAWVIEWSHELL"
 #define HID_SDGRAPHICVIEWSHELL  
"SD_HID_SDGRAPHICVIEWSHELL"
 #define HID_SDOUTLINEVIEWSHELL  
"SD_HID_SDOUTLINEVIEWSHELL"
-#define HID_SD_WIN_DOCUMENT 
"SD_HID_SD_WIN_DOCUMENT"
-#define HID_SD_NAVIGATOR_TLB
"SD_HID_SD_NAVIGATOR_TLB"
-#define HID_SD_NAVIGATOR
"SD_HID_SD_NAVIGATOR"
-#define HID_SD_NAVIGATOR_TBX
"SD_HID_SD_NAVIGATOR_TBX"
-#define HID_SD_NAVIGATOR_LB 
"SD_HID_SD_NAVIGATOR_LB"
-#define HID_SD_NAVIGATOR_TBI_FIRST  
"SD_HID_SD_NAVIGATOR_TBI_FIRST"
-#define HID_SD_NAVIGATOR_TBI_PREV   
"SD_HID_SD_NAVIGATOR_TBI_PREV"
-#define HID_SD_NAVIGATOR_TBI_NEXT   
"SD_HID_SD_NAVIGATOR_TBI_NEXT"
-#define HID_SD_NAVIGATOR_TBI_LAST   
"SD_HID_SD_NAVIGATOR_TBI_LAST"
-#define HID_SD_NAVIGATOR_TBI_DRAGTYPE   
"SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE"
-#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER   
"SD_HID_SD_NAVIGATOR_TBI_SHAPE_FILTER"
 
 // tool boxes
 #define HID_SD_DRAW_TOOLBOX 
"SD_HID_SD_DRAW_TOOLBOX"
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index d9c2f4a..0719ce1 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -857,4 +857,28 @@ Bitmap BMP_PRESENTATION_MINIMIZER
 File = "minimize_presi_80.png";
 };
 
+Image IMG_EMBEDDED
+{
+ImageBitmap = Bitmap
+{
+File = "nv08.png" ;
+};
+};
+
+Image IMG_LINK
+{
+ImageBitmap = Bitmap
+{
+File = "nv09.png" ;
+};
+};
+
+Image IMG_HYPERLINK
+{
+ImageBitmap = Bitmap
+{
+File = "nv010.png" ;
+};
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index c939eb5..08ef963 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1257,4 +1257,9 @@ String STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS
 Text [ en-US ] = "All supported formats";
 };
 
+String STR_OBJECTS_TREE
+{
+Text [ en-US ] = "Page Tree";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx 
b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 8a30766..4f55f39 100644
--- 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - loleaflet/Makefile loolwsd/configure.ac

[Andras Timar]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8f505f5991bad386d0a9b40b28f98f0ff5ef0d0
Author: Andras Timar 
Date:   Wed Oct 12 13:17:05 2016 +0200

Bump version to 1.9.5

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 0a8cb52..e250798 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.9.4
+VERSION=1.9.5
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index adf548a..0a3d242 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.9.4], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.9.5], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/svx svx/AllLangResTarget_svx.mk svx/source

[Caolán McNamara]

 dbaccess/source/ui/inc/dbu_resource.hrc   |4 --
 dbaccess/source/ui/tabledesign/TableDesignControl.cxx |   16 +
 dbaccess/source/ui/tabledesign/table.src  |   10 -
 include/svx/dialogs.hrc   |4 --
 svx/AllLangResTarget_svx.mk   |1 
 svx/source/sidebar/EmptyPanel.cxx |   17 +++--
 svx/source/sidebar/EmptyPanel.hrc |   25 --
 svx/source/sidebar/EmptyPanel.src |   32 --
 svx/source/stbctrls/stbctrls.src  |5 ++
 9 files changed, 21 insertions(+), 93 deletions(-)

New commits:
commit 8215167bac4f34a2f1432ab247c8984d8f448372
Author: Caolán McNamara 
Date:   Wed Oct 12 15:23:00 2016 +0100

de-src RID_DB_TAB_EDITOR control

Change-Id: Idba73ea9bf2486d40b24e59bf6f1f5092ec70558

diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc 
b/dbaccess/source/ui/inc/dbu_resource.hrc
index cfe1de2..01c1c78 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -141,10 +141,6 @@
 #define RID_MENU_JOINVIEW_CONNECTIONRID_MENU_START + 16
 #define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17
 
-// controls
-
-#define RID_DB_TAB_EDITOR   RID_CONTROL_START +  0
-
 // strings
 #define STR_TBL_TITLE   RID_STR_GEN_START
 #define STR_ERROR_DURING_CREATION   RID_STR_GEN_START + 1
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx 
b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 62dc378..a774f58 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -35,14 +35,16 @@ using namespace ::com::sun::star::util;
 #define HANDLE_ID 0
 
 OTableRowView::OTableRowView(vcl::Window* pParent)
-:EditBrowseBox(pParent, 
ModuleRes(RID_DB_TAB_EDITOR),EditBrowseBoxFlags::NONE,
-BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION 
| BrowserMode::AUTOSIZE_LASTCOL |
-BrowserMode::KEEPHIGHLIGHT | BrowserMode::HLINES | 
BrowserMode::VLINES)
-,m_nDataPos(-1)
-,m_nCurrentPos(-1)
-,m_nCurUndoActId(0)
+: EditBrowseBox(pParent, EditBrowseBoxFlags::NONE, 
WB_TABSTOP|WB_HIDE|WB_3DLOOK,
+BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION 
|
+BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT 
|
+BrowserMode::HLINES | BrowserMode::VLINES)
+, m_nDataPos(-1)
+, m_nCurrentPos(-1)
+, m_nCurUndoActId(0)
 {
-
+SetHelpId(HID_TABDESIGN_BACKGROUND);
+SetSizePixel(LogicToPixel(Size(40, 12), MapUnit::MapAppFont));
 }
 
 void OTableRowView::Init()
diff --git a/dbaccess/source/ui/tabledesign/table.src 
b/dbaccess/source/ui/tabledesign/table.src
index 1bcbf34..d0dc8ee 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -123,16 +123,6 @@ String STR_TAB_TABLE_PROPERTIES
 Text [ en-US ] = "Table properties";
 };
 
-Control RID_DB_TAB_EDITOR
-{
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( 40 , 12 ) ;
-TabStop = TRUE ;
-SvLook = TRUE ;
-Hide = TRUE ;
-HelpId = HID_TABDESIGN_BACKGROUND ;
-};
-
 Menu RID_TABLEDESIGNROWPOPUPMENU
 {
 ItemList =
commit d1a6aea1dab9b0b5bf914dd3644e5279598c1f10
Author: Caolán McNamara 
Date:   Wed Oct 12 15:06:53 2016 +0100

de-src empty panel placeholder widgetry

Change-Id: I99a292cd76f40159f12cb98b362559e4109121c3

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index c44b6c5..aba0095 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -196,9 +196,7 @@
 #define RID_SVXIMG_NOTCHECKED   (RID_SVX_START + 243)
 #define RID_SVXIMG_CHECKED  (RID_SVX_START + 244)
 
-#define RID_SIDEBAR_LINE_PANEL  (RID_SVX_START + 321)
-
-#define RID_SIDEBAR_EMPTY_PANEL (RID_SVX_START + 327)
+#define RID_SIDEBAR_EMPTY_PANEL_TEXT(RID_SVX_START + 321)
 
 // !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new 
RIDs !!! (see above)
 
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index c56a5ce..3a98734 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
 svx/source/form/fmstring.src \
 svx/source/items/svxerr.src \
 svx/source/items/svxitems.src \
-svx/source/sidebar/EmptyPanel.src \
 svx/source/sidebar/area/AreaPropertyPanel.src \
 svx/source/sidebar/line/LinePropertyPanel.src \
 svx/source/sidebar/paragraph/ParaPropertyPanel.src \
diff --git a/svx/source/sidebar/EmptyPanel.cxx 
b/svx/source/sidebar/EmptyPanel.cxx
index e436ba8..00579c3 100644
--- a/svx/source/sidebar/EmptyPanel.cxx
+++ 

[Libreoffice-commits] core.git: include/sal Repository.mk xmlsecurity/Executable_pdfverify.mk xmlsecurity/Module_xmlsecurity.mk xmlsecurity/source

[Miklos Vajna]

 Repository.mk  |1 
 include/sal/log-areas.dox  |1 
 xmlsecurity/Executable_pdfverify.mk|   41 
 xmlsecurity/Module_xmlsecurity.mk  |8 
 xmlsecurity/source/pdfio/pdfverify.cxx | 1539 +
 5 files changed, 1590 insertions(+)

New commits:
commit 53bba96ac0c76e2971532d13a09d9fd90b3299c7
Author: Miklos Vajna 
Date:   Wed Oct 12 16:50:09 2016 +0200

xmlsecurity: add initial Executable_pdfverify

We have code to verify ODF and OOXML signatures, this adds initial
support for verifying a PDF signature.

Initially this is a standalone executable, need to turn this into a unit
test + hook it into sfx2 in follow-up commits.

Change-Id: Ideb5ec63f761c74fd4527cf1766b0aa739e275ee

diff --git a/Repository.mk b/Repository.mk
index cac6233..f8599b3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
osl_process_child \
pdf2xml \
pdfunzip \
+   pdfverify \
pocheck \
propex \
regsvrex \
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 70661fe..c5c8f4e 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -509,6 +509,7 @@ certain functionality.
 @li @c xmlsecurity.comp - xml security component
 @li @c xmlsecurity.dialogs - xml security dialogs
 @li @c xmlsecurity.helper
+@li @c xmlsecurity.pdfio - signing of existing PDF
 @li @c xmlsecurity.xmlsec - xmlsec wrapper
 
 @section xmlscript
diff --git a/xmlsecurity/Executable_pdfverify.mk 
b/xmlsecurity/Executable_pdfverify.mk
new file mode 100644
index 000..c62698f
--- /dev/null
+++ b/xmlsecurity/Executable_pdfverify.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,pdfverify))
+
+$(eval $(call gb_Executable_use_sdk_api,pdfverify))
+
+$(eval $(call gb_Executable_set_include,pdfverify,\
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,pdfverify,\
+comphelper \
+sal \
+tl \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,pdfverify,\
+xmlsecurity/source/pdfio/pdfverify \
+))
+
+ifeq ($(OS)-$(COM),WNT-MSC)
+$(eval $(call gb_Executable_add_defs,pdfverify,\
+-DXMLSEC_CRYPTO_MSCRYPTO \
+))
+else
+$(eval $(call gb_Executable_add_defs,pdfverify,\
+-DXMLSEC_CRYPTO_NSS \
+))
+$(eval $(call gb_Executable_use_externals,pdfverify,\
+nss3 \
+))
+endif
+
+# vim:set noet sw=4 ts=4:
diff --git a/xmlsecurity/Module_xmlsecurity.mk 
b/xmlsecurity/Module_xmlsecurity.mk
index 3c9b220..04d1087 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -36,4 +36,12 @@ $(eval $(call gb_Module_add_screenshot_targets,xmlsecurity,\
 CppunitTest_xmlsecurity_dialogs_test \
 ))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
+$(eval $(call gb_Module_add_targets,xmlsecurity,\
+Executable_pdfverify \
+))
+
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/source/pdfio/pdfverify.cxx 
b/xmlsecurity/source/pdfio/pdfverify.cxx
new file mode 100644
index 000..5bf50b6
--- /dev/null
+++ b/xmlsecurity/source/pdfio/pdfverify.cxx
@@ -0,0 +1,1539 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#ifdef XMLSEC_CRYPTO_NSS
+#include 
+#include 
+#include 
+#include 
+#endif
+
+using namespace com::sun::star;
+
+namespace xmlsecurity
+{
+namespace pdfio
+{
+
+/// A byte range in a PDF file.
+class PDFElement
+{
+public:
+virtual bool Read(SvStream& rStream) = 0;
+virtual ~PDFElement() { }
+};
+
+class PDFTrailerElement;
+class PDFObjectElement;
+
+/// In-memory representation of an on-disk PDF document.
+class PDFDocument
+{
+/// This vector owns all elements.
+std::vector< std::unique_ptr > m_aElements;
+// List of object offsets we know.
+std::vector m_aXRef;
+PDFTrailerElement* m_pTrailer;
+
+static int AsHex(char ch);
+
+public:
+PDFDocument();
+static OString ReadKeyword(SvStream& rStream);
+static size_t FindStartXRef(SvStream& rStream);
+void ReadXRef(SvStream& rStream);
+static void SkipWhitespace(SvStream& rStream);
+size_t GetObjectOffset(size_t nIndex) const;
+const 

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

[Caolán McNamara]

 include/svtools/editbrowsebox.hxx   |1 -
 svtools/source/brwbox/editbrowsebox.cxx |   30 --
 2 files changed, 31 deletions(-)

New commits:
commit f9a0f120a0939a71f6bcff32e6e9d2502f240093
Author: Caolán McNamara 
Date:   Wed Oct 12 15:26:03 2016 +0100

no EditBrowseBox is loaded from .src anymore

Change-Id: I70c4cfa85a4a4379ee80e73066193676ca83b5b0

diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 8f66b13..1f2be5b 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -586,7 +586,6 @@ namespace svt
 
 public:
 EditBrowseBox(vcl::Window* pParent, EditBrowseBoxFlags nBrowserFlags = 
EditBrowseBoxFlags::NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = 
BrowserMode::NONE );
-EditBrowseBox(vcl::Window* pParent, const ResId& rId, 
EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, BrowserMode nMode 
= BrowserMode::NONE );
 virtual ~EditBrowseBox() override;
 virtual void dispose() override;
 
diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index be82911..d374f81 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -66,10 +66,8 @@ namespace svt
 {
 }
 
-
 //= EditBrowserHeader
 
-
 void EditBrowserHeader::DoubleClick()
 {
 sal_uInt16 nColId = GetCurItemId();
@@ -84,16 +82,13 @@ namespace svt
 }
 }
 
-
 //= EditBrowseBox
 
-
 void EditBrowseBox::BrowserMouseEventPtr::Clear()
 {
 DELETEZ(pEvent);
 }
 
-
 void EditBrowseBox::BrowserMouseEventPtr::Set(const BrowserMouseEvent* 
pEvt, bool bIsDown)
 {
 if (pEvt == pEvent)
@@ -114,7 +109,6 @@ namespace svt
 }
 }
 
-
 void EditBrowseBox::impl_construct()
 {
 m_aImpl.reset(new EditBrowseBoxImpl());
@@ -129,28 +123,6 @@ namespace svt
 pCheckBoxPaint->SetBackground();
 }
 
-
-EditBrowseBox::EditBrowseBox(vcl::Window* pParent, const ResId& rId, 
EditBrowseBoxFlags nBrowserFlags, BrowserMode _nMode )
-  :BrowseBox( pParent, rId, _nMode )
-  ,nStartEvent(nullptr)
-  ,nEndEvent(nullptr)
-  ,nCellModifiedEvent(nullptr)
-  ,m_pFocusWhileRequest(nullptr)
-  ,nPaintRow(-1)
-  ,nEditRow(-1)
-  ,nOldEditRow(-1)
-  ,nEditCol(0)
-  ,nOldEditCol(0)
-  ,bHasFocus(false)
-  ,bPaintStatus(true)
-  ,bActiveBeforeTracking( false )
-  ,m_nBrowserFlags(nBrowserFlags)
-  ,pHeader(nullptr)
-{
-impl_construct();
-}
-
-
 EditBrowseBox::EditBrowseBox( vcl::Window* pParent, EditBrowseBoxFlags 
nBrowserFlags, WinBits nBits, BrowserMode _nMode )
   :BrowseBox( pParent, nBits, _nMode )
   ,nStartEvent(nullptr)
@@ -171,13 +143,11 @@ namespace svt
 impl_construct();
 }
 
-
 void EditBrowseBox::Init()
 {
 // late construction
 }
 
-
 EditBrowseBox::~EditBrowseBox()
 {
 disposeOnce();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - helpers/createmakefile.pl helpers/linkmakefile.template helpers/makefile.template helpers/README

[Andras Timar]

 helpers/README|5 
 helpers/createmakefile.pl |  452 --
 helpers/linkmakefile.template |   53 
 helpers/makefile.template |   43 ---
 4 files changed, 553 deletions(-)

New commits:
commit d0edb8833eae3f76869e8718c380e491f1d23419
Author: Andras Timar 
Date:   Wed Oct 12 14:11:40 2016 +0200

remove old dmake related helper files

Change-Id: I71dc2ef7dfdbcfaf82e4ae3875fef7de62db0e64

diff --git a/helpers/createmakefile.pl b/helpers/createmakefile.pl
deleted file mode 100644
index e6bf34b..000
--- a/helpers/createmakefile.pl
+++ /dev/null
@@ -1,452 +0,0 @@
-#!/usr/bin/perl
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-use File::Find;
-use File::Basename;
-
-# creates the help2 makefile for a given
-# directory including all help xhp files
-# in that and the subordinate directories
-# Only help files with the following
-#
-# status values are included:
-# PUBLISH DEPRECATED
-#
-# The following status values are
-# disregarded:
-# DRAFT FINAL STALLED
-
-$makefiletemplate = 'helpers/makefile.template';
-$linkmakefiletemplate = 'helpers/linkmakefile.template';
-$prj = "helpcontent2";
-$helpdirprefix = "$prj/source/";
-
-undef @sbasic;
-undef @scalc;
-undef @schart;
-undef @sdraw;
-undef @shared;
-undef @simpress;
-undef @smath;
-undef @swriter;
-
-$params = join "|", "",@ARGV,"";
-($params =~ /-dir/) ? ($startdir = $params) =~ (s/.*-dir=([^\|]*).*$/$1/gs) : 
(($startdir = `pwd`) =~ s/\n//gs);
-($startdir = $startdir."/source/text") if ($startdir =~ /$prj$/);
-($params =~ /-linkdir/) ? ($linkdir = $params) =~ 
(s/.*-linkdir=([^\|]*).*$/$1/gs) : (($linkdir = `pwd`) =~ s/\n//gs);
-($linkdir = $linkdir."/util") if ($linkdir =~ /$prj$/);
-$recursive = $params =~ /-recursive/ || 0;
-$all = $params =~ /-all/ || 0;
-
-if (open TMPL, $makefiletemplate) {
-undef $/;
-$tmpl = ;
-close TMPL;
-} else {
-("Cannot open $makefiletemplate");
-}
-
-if (open LINKTMPL, $linkmakefiletemplate) {
-undef $/;
-$linktmpl = ;
-close LINKTMPL;
-} else {
-("Cannot open $linkmakefiletemplate");
-}
-
-print "Start Directory: $startdir\n";
-print "Link Directory : $linkdir\n";
-print "Recursive  : ". ($recursive ? "yes" : "no") . "\n";
-print "All files  : ". ($all ? "yes" : "no") . "\n";
-
-if ($recursive) {
-find(sub{push @dirs, $File::Find::name if (-d and 
($File::Find::name!~/\/CVS/));},$startdir);
-} else {
-push @dirs, $startdir;
-}
-
-#print join "\n", @dirs;
-#die;
-
-for $d(@dirs) {
-opendir DIR, $d;
-@files = grep {/xhp$/} readdir DIR;
-undef @files2;
-closedir DIR;
-
-($helpdir = $d) =~ s/.*\/$helpdirprefix/source\//gis;
-
-($package = $helpdir) =~ s/^source\///gi;
-
-($target = $package) =~ s/\//_/g; $target =~ s/_$//;
-($module = $package) =~ s/^\/*text\/([^\/]+)\/*.*$/$1/;
-
-for $f(@files) {
-($n,$p,$e) = fileparse($f,".xhp");
-if (not $all) {
-if (open XML, $d.'/'.$f) {
-undef $/;
-($status = ) =~ 
s/.*]*status="([^"]*)"[^>]*>.*$/$1/gs;
-close XML;
-} else {
-die "Error: Cannot open ${d}/$f:$!\n";
-}
-if ($status =~ /(DEPRECATED|PUBLISH)/i) {
-($p2=$package) =~ s,/,\$/,gis;
-push @{$module}, $p2.'$/'.$n.'.xhp';
-push @files2, ''.$n.'.xhp ';
-}
-} else {
-($p2=$package) =~ s,/,\$/,gis;
-push @{$module}, $p2.'$/'.$n.'.xhp';
-push @files2, '   '.$n.'.xhp ';
-}
-}
-
-printf "%s: %4d files, %4d included in makefile -> ",$d,scalar 
@files,scalar @files2;
-
-if (scalar @files2 > 0) { # don't write makefiles where there are no files 
to make
-($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = 
localtime(time);
-
-$auth = "script";
-$date = sprintf "%4d/%02d/%02d 
%02d:%02d:%02d",$year+1900,$mon,$mday,$hour,$min,$sec;
-$prj = '..$/' x ((split "/", $helpdir) -1); $prj = $prj . "..";
-
-
-$xhpfiles = join "\\\n", sort @files2;
-
-($makefile = $tmpl) =~ 

[Libreoffice-commits] core.git: comphelper/source configmgr/source desktop/source include/comphelper

[Armin Le Grand]

 comphelper/source/misc/backupfilehelper.cxx |  766 ++-
 configmgr/source/components.cxx |   29 
 desktop/source/app/app.cxx  |  144 -
 desktop/source/app/app.cxx.orig | 2735 
 include/comphelper/backupfilehelper.hxx |   10 
 5 files changed, 3490 insertions(+), 194 deletions(-)

New commits:
commit 5f1a338d54966f77e8aef2c77e5d01260f2f5bbe
Author: Armin Le Grand 
Date:   Wed Oct 12 13:25:54 2016 +0200

profilesafe: Multiple adaptions

Added own directory in User config to where the
saved content is written and taken from, adapted
to also handle ExtensionConfiguration, changed
point for creating backups of configuration to
doShutdown, create no configuration when a restart
is triggered (untested configuration)

Change-Id: Id7a96195b765842c31cacf81cc08d2965a205281
Reviewed-on: https://gerrit.libreoffice.org/29729
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index 8b842de..f452213 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -8,15 +8,25 @@
  */
 
 #include 
-
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
+using namespace css;
 typedef std::shared_ptr< osl::File > FileSharedPtr;
 static const sal_uInt32 BACKUP_FILE_HELPER_BLOCK_SIZE = 16384;
 
@@ -84,6 +94,403 @@ namespace
 
 return nCrc32;
 }
+
+bool read_sal_uInt32(FileSharedPtr& rFile, sal_uInt32& rTarget)
+{
+sal_uInt8 aArray[4];
+sal_uInt64 nBaseRead(0);
+
+// read rTarget
+if (osl::File::E_None == rFile->read(static_cast(aArray), 4, 
nBaseRead) && 4 == nBaseRead)
+{
+rTarget = (sal_uInt32(aArray[0]) << 24) + (sal_uInt32(aArray[1]) 
<< 16) + (sal_uInt32(aArray[2]) << 8) + sal_uInt32(aArray[3]);
+return true;
+}
+
+return false;
+}
+
+bool write_sal_uInt32(oslFileHandle& rHandle, sal_uInt32 nSource)
+{
+sal_uInt8 aArray[4];
+sal_uInt64 nBaseWritten(0);
+
+// write nSource
+aArray[0] = sal_uInt8((nSource & 0xff00) >> 24);
+aArray[1] = sal_uInt8((nSource & 0x00ff) >> 16);
+aArray[2] = sal_uInt8((nSource & 0xff00) >> 8);
+aArray[3] = sal_uInt8(nSource & 0x00ff);
+
+if (osl_File_E_None == osl_writeFile(rHandle, static_cast(aArray), 4, ) && 4 == nBaseWritten)
+{
+return true;
+}
+
+return false;
+}
+
+bool read_OString(FileSharedPtr& rFile, OString& rTarget)
+{
+sal_uInt32 nLength(0);
+
+if (!read_sal_uInt32(rFile, nLength))
+{
+return false;
+}
+
+std::vector< sal_Char > aTarget(nLength);
+sal_uInt64 nBaseRead(0);
+
+// read rTarget
+if (osl::File::E_None == rFile->read(static_cast([0]), 
nLength, nBaseRead) && nLength == nBaseRead)
+{
+rTarget = OString([0], static_cast< sal_Int32 >(nLength));
+return true;
+}
+
+return false;
+}
+
+bool write_OString(oslFileHandle& rHandle, const OString& rSource)
+{
+const sal_uInt32 nLength(rSource.getLength());
+
+if (!write_sal_uInt32(rHandle, nLength))
+{
+return false;
+}
+
+sal_uInt64 nBaseWritten(0);
+
+if (osl_File_E_None == osl_writeFile(rHandle, static_cast(rSource.getStr()), nLength, ) && nLength == nBaseWritten)
+{
+return true;
+}
+
+return false;
+}
+
+bool fileExists(const OUString& rBaseURL)
+{
+if (!rBaseURL.isEmpty())
+{
+FileSharedPtr aBaseFile(new osl::File(rBaseURL));
+
+return (osl::File::E_None == 
aBaseFile->open(osl_File_OpenFlag_Read));
+}
+
+return false;
+}
+}
+
+namespace
+{
+enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE };
+
+class ExtensionInfoEntry
+{
+private:
+PackageStatemeState;// REGISTERED, NOT_REGISTERED, 
AMBIGUOUS, NOT_AVAILABLE
+OString maRepositoryName;   // user|shared|bundled
+OString maName;
+OString maIdentifier;
+OString maVersion;
+
+public:
+ExtensionInfoEntry()
+:   meState(NOT_AVAILABLE),
+maRepositoryName(),
+maName(),
+maIdentifier(),
+maVersion()
+{
+}
+
+ExtensionInfoEntry(const uno::Reference< deployment::XPackage >& 
rxPackage)
+:   meState(NOT_AVAILABLE),
+

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

[Armin Le Grand]

 desktop/source/app/app.cxx.orig | 2735 
 1 file changed, 2735 deletions(-)

New commits:
commit d79ac386cd959eacd25a0e0afbc0e995b08eec18
Author: Armin Le Grand 
Date:   Wed Oct 12 16:27:22 2016 +0200

Removed by-error-pushed desktop/source/app/app.cxx.orig

Change-Id: I87a25028b82f7f6d107b2b234e20a9af6382d113

diff --git a/desktop/source/app/app.cxx.orig b/desktop/source/app/app.cxx.orig
deleted file mode 100644
index a9d10c3..000
--- a/desktop/source/app/app.cxx.orig
+++ /dev/null
@@ -1,2735 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include 
-
-#include 
-
-#include 
-#if defined UNX
-#include 
-#endif
-
-#include "app.hxx"
-#include "desktop.hrc"
-#include "cmdlineargs.hxx"
-#include "cmdlinehelp.hxx"
-#include "dispatchwatcher.hxx"
-#include "lockfile.hxx"
-#include "userinstall.hxx"
-#include "desktopcontext.hxx"
-#include "migration.hxx"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "langselect.hxx"
-
-#include 
-
-#if ENABLE_TELEPATHY
-#include 
-#endif
-
-#if HAVE_FEATURE_BREAKPAD
-#include 
-#endif
-
-#if defined MACOSX
-#include 
-#include 
-#endif
-
-#ifdef _WIN32
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#pragma warning (disable: 4005)
-#endif
-#define WIN32_LEAN_AND_MEAN
-#include 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#endif //WNT
-
-#if defined(_WIN32)
-#include 
-#define GETPID _getpid
-#else
-#include 
-#define GETPID getpid
-#endif
-
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::system;
-using namespace ::com::sun::star::ui;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::container;
-
-ResMgr* desktop::Desktop::pResMgr = nullptr;
-
-namespace desktop
-{
-
-static oslSignalHandler pSignalHandler = nullptr;
-
-namespace {
-
-#if HAVE_FEATURE_EXTENSIONS
-
-// Remove any existing UserInstallation's extensions cache data remaining from
-// old installations.  This addresses at least two problems:
-//
-// For one, apparently due to the old share/prereg/bundled mechanism (disabled
-// since 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
-// share/prereg/bundled to avoid startup crashes"), the user/extensions/bundled
-// cache could contain corrupted information (like a UNO component registered
-// twice, which got changed from active to passive registration in one LO
-// version, but the version of the corresponding bundled extension only
-// incremented in a later LO version).
-//
-// For another, UserInstallations have been seen in the wild where no 
extensions
-// were installed per-user (any longer), but user/uno_packages/cache/registry/
-// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
-// contained data nevertheless.
-//
-// When a LO upgrade is detected (i.e., no user/extensions/buildid or one
-// containing an old build ID), then user/extensions and
-// user/uno_packages/cache/registry/
-// 

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

[Katarina Behrens]

 cui/source/tabpages/tparea.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2ee2757f152eadd880f222553daf253d98d31efa
Author: Katarina Behrens 
Date:   Wed Oct 12 10:54:35 2016 +0200

Avoid one more crash on switching to pattern tab

this one happens when selecting Format > Area with no shape selection
or in Draw's page properties dialog

Change-Id: I20c94d4ac0c0ad20a4ac3f28275d1ca7f9ccdeb9
Reviewed-on: https://gerrit.libreoffice.org/29726
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index bfd5a4b..0724505 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -353,6 +353,7 @@ void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
 const SvxGradientListItem* pGradientListItem = 
aSet.GetItem(SID_GRADIENT_LIST, false);
 const SvxHatchListItem* pHatchingListItem = 
aSet.GetItem(SID_HATCH_LIST, false);
 const SvxBitmapListItem* pBitmapListItem = 
aSet.GetItem(SID_BITMAP_LIST, false);
+const SvxPatternListItem* pPatternListItem = 
aSet.GetItem(SID_PATTERN_LIST, false);
 
 if (pColorListItem)
 SetColorList(pColorListItem->GetColorList());
@@ -362,6 +363,8 @@ void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
 SetHatchingList(pHatchingListItem->GetHatchList());
 if (pBitmapListItem)
 SetBitmapList(pBitmapListItem->GetBitmapList());
+if (pPatternListItem)
+SetPatternList(pPatternListItem->GetPatternList());
 }
 
 void SvxAreaTabPage::PointChanged( vcl::Window* , RectPoint )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/svtools/brwbox.hxx|2 --
 svtools/source/brwbox/brwbox1.cxx |   12 
 2 files changed, 14 deletions(-)

New commits:
commit 7f5d27a7a7d51282bc816f945bbe7f8df25b0e6c
Author: Caolán McNamara 
Date:   Wed Oct 12 16:24:26 2016 +0100

no Browse is loaded from .src anymore

Change-Id: I72e87433fef1a27c6bcac2746d9d366335797800

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index cdaca6b..5ec84e6 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -393,8 +393,6 @@ protected:
 public:
 BrowseBox( vcl::Window* pParent, WinBits nBits = 0,
BrowserMode nMode = BrowserMode::NONE );
-BrowseBox( vcl::Window* pParent, const ResId& rId,
-   BrowserMode nMode = BrowserMode::NONE );
 virtual ~BrowseBox() override;
 virtual voiddispose() override;
 
diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index 37deeb5..8a7b1fa 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -110,7 +110,6 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
 ( bHasFocus ? 0 : 1 ) + ( GetUpdateMode() ? 0 : 1 );
 }
 
-
 BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode )
 :Control( pParent, nBits | WB_3DLOOK )
 ,DragSourceHelper( this )
@@ -120,17 +119,6 @@ BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, 
BrowserMode nMode )
 ConstructImpl( nMode );
 }
 
-
-BrowseBox::BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode 
nMode )
-:Control( pParent, rId )
-,DragSourceHelper( this )
-,DropTargetHelper( this )
-,aHScroll( VclPtr::Create(this, WinBits(WB_HSCROLL)) )
-{
-ConstructImpl(nMode);
-}
-
-
 BrowseBox::~BrowseBox()
 {
 disposeOnce();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 svx/source/dialog/SafeModeDialog.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 18a4aa3f70419e3b51a324912d0444eecf92dbd6
Author: Samuel Mehrbrodt 
Date:   Wed Oct 12 16:48:49 2016 +0200

SafeModeDialog: Remove flag also when exiting

Change-Id: I5d1bf17ace062f07287d3b3427eaab144ea7c0f8

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index 1da58a0..53d9911 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -71,6 +71,9 @@ bool SafeModeDialog::Close()
 
 void SafeModeDialog::terminateOffice()
 {
+// We are not hitting Close() in this case, need to manually remove the 
flag
+sfx2::SafeMode::removeFlag();
+
 uno::Reference xDesktop = frame::Desktop::create( 
comphelper::getProcessComponentContext() );
 xDesktop->terminate();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 reportdesign/source/ui/inspection/GeometryHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bac147271317c883bf36dbe41d09036f627e005b
Author: Stephan Bergmann 
Date:   Wed Oct 12 17:20:58 2016 +0200

warning C4018: '<' : signed/unsigned mismatch

Change-Id: Ie326f95e165ffd0988bc5aff76370b8e86d158d5

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 589e9dc..214b6a5 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1252,7 +1252,7 @@ uno::Any SAL_CALL 
GeometryHandler::convertToControlValue(const OUString & Proper
 aPropertyValue >>= nParagraphVertAlign;
 ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST);
 ResStringArray aResList(aRes);
-if (nParagraphVertAlign < aResList.Count())
+if (sal_uInt32(nParagraphVertAlign) < aResList.Count())
 aControlValue <<= aResList.GetString(nParagraphVertAlign);
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/source include/tools reportdesign/source

[Caolán McNamara]

 extensions/source/propctrlr/formcomponenthandler.cxx  |   26 +-
 extensions/source/propctrlr/formres.src   |   12 -
 extensions/source/propctrlr/handlerhelper.cxx |   18 +
 extensions/source/propctrlr/handlerhelper.hxx |   28 ++
 extensions/source/propctrlr/propres.src   |   11 -
 extensions/source/propctrlr/stringrepresentation.cxx  |   13 -
 include/tools/StringListResource.hxx  |   49 
 reportdesign/source/ui/inspection/GeometryHandler.cxx |   99 ++---
 reportdesign/source/ui/inspection/inspection.src  |  182 +++---
 9 files changed, 206 insertions(+), 232 deletions(-)

New commits:
commit ad067cb0c7a5fc0bb31b87e54effe6e335d129c9
Author: Caolán McNamara 
Date:   Wed Oct 12 13:24:04 2016 +0100

remove StringListResource in favour of ResStringArray...

and turn local resources used as lists of strings into
string array resources

Change-Id: I9d67a790659963bca87aacba1c052d7b244b4e21

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index e6b40c6..362861d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -95,10 +95,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -545,10 +545,9 @@ namespace pcr
 OUString sControlValue;
 OSL_VERIFY( _rControlValue >>= sControlValue );
 
-::std::vector< OUString > aListEntries;
-tools::StringListResource aRes( PcrRes( RID_RSC_ENUM_SHOWHIDE ), 
aListEntries );
-OSL_ENSURE( aListEntries.size() == 2, 
"FormComponentPropertyHandler::convertToPropertyValue: broken resource for 
Show/Hide!" );
-bool bShow = ( aListEntries.size() < 2 ) || ( sControlValue == 
aListEntries[1] );
+ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_SHOWHIDE));
+OSL_ENSURE( aListEntries.Count() == 2, 
"FormComponentPropertyHandler::convertToPropertyValue: broken resource for 
Show/Hide!" );
+bool bShow = ( aListEntries.Count() < 2 ) || ( sControlValue == 
aListEntries.GetString(1) );
 
 aPropertyValue <<= bShow;
 }
@@ -651,15 +650,14 @@ namespace pcr
 case PROPERTY_ID_SHOW_RECORDACTIONS:
 case PROPERTY_ID_SHOW_FILTERSORT:
 {
-::std::vector< OUString > aListEntries;
-tools::StringListResource aRes( PcrRes( RID_RSC_ENUM_SHOWHIDE ), 
aListEntries );
-OSL_ENSURE( aListEntries.size() == 2, 
"FormComponentPropertyHandler::convertToControlValue: broken resource for 
Show/Hide!" );
+ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_SHOWHIDE));
+OSL_ENSURE( aListEntries.Count() == 2, 
"FormComponentPropertyHandler::convertToControlValue: broken resource for 
Show/Hide!" );
 
-if ( aListEntries.size() == 2 )
+if (aListEntries.Count() == 2)
 {
 OUString sControlValue = ::comphelper::getBOOL( 
_rPropertyValue )
-?   aListEntries[1]
-:   aListEntries[0];
+?   aListEntries.GetString(1)
+:   aListEntries.GetString(0);
 aControlValue <<= sControlValue;
 }
 }
@@ -1252,9 +1250,9 @@ namespace pcr
 )
 nResId = RID_RSC_ENUM_SHOWHIDE;
 
-::std::vector< OUString > aListEntries;
-tools::StringListResource aRes(PcrRes(nResId),aListEntries);
-aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( 
_rxControlFactory, aListEntries, false, false );
+PcrRes aRes(nResId);
+ResStringArray aListEntries(aRes);
+aDescriptor.Control = 
PropertyHandlerHelper::createListBoxControl(_rxControlFactory, aListEntries, 
false, false);
 bNeedDefaultStringIfVoidAllowed = true;
 }
 
diff --git a/extensions/source/propctrlr/formres.src 
b/extensions/source/propctrlr/formres.src
index 728c784..654515f 100644
--- a/extensions/source/propctrlr/formres.src
+++ b/extensions/source/propctrlr/formres.src
@@ -1226,17 +1226,15 @@ String RID_STR_TEXTTYPE
 Text [ en-US ] = "Text type";
 };
 
-Resource RID_RSC_ENUM_SHOWHIDE
+StringArray RID_RSC_ENUM_SHOWHIDE
 {
-String 1
+ItemList [ en-US ] =
 {
-Text [ en-US ] = "Hide" ;
-};
-String 2
-{
-Text [ en-US ] = "Show" ;
+< "Hide" ; >;
+< "Show" ; >;
 };
 };
+
 String RID_STR_XML_DATA_MODEL
 {
 Text [ en-US ] = "XML data model";
diff --git a/extensions/source/propctrlr/handlerhelper.cxx 
b/extensions/source/propctrlr/handlerhelper.cxx
index ad612c5..a4feb71 100644
--- 

Re: concat of OUStringBuffer

[Stephan Bergmann]

On 10/11/2016 09:48 AM, Stephan Bergmann wrote:

On 10/10/2016 10:24 PM, Eike Rathke wrote:

I'd rather say it's a bug when assigning the involved OUStringBuffer
(here aLCIDString) to itself again.. so for clarification:

https://gerrit.libreoffice.org/#/c/28666/5 had

aLCIDString = "[$-" + aLCIDString + "]";
aFormatStr.insert( nPosInsertLCID, aLCIDString.toString() );

which produced an erroneous "[$-[$-[$-0]"


Ouch.  Would probably make sense to forbid that O[U]StringBuffer takes
part in such concatenations (by removing the
ToStringHelper specializations, which are luckily
LIBO_INTERNAL_ONLY).  I'll look into that.


 
"Don't allow O[U]StringBuffer in string concatenation"


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

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

[Yousuf Philips]

 extensions/source/bibliography/sections.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4ceadf4504d572ef9c75b452965c058678b9c7ce
Author: Yousuf Philips 
Date:   Sun Sep 11 00:02:38 2016 +0400

tdf#70979 make conference proceedings strings unique

Change-Id: I8386651390ba753108577ced29050585b72c5e78
Reviewed-on: https://gerrit.libreoffice.org/28813
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/extensions/source/bibliography/sections.src 
b/extensions/source/bibliography/sections.src
index ceec0d7..cf5da97 100644
--- a/extensions/source/bibliography/sections.src
+++ b/extensions/source/bibliography/sections.src
@@ -37,7 +37,7 @@ String ST_TYPE_BOOKLET
 };
 String ST_TYPE_CONFERENCE
 {
-Text [ en-US ] = "Conference proceedings";
+Text [ en-US ] = "Conference proceedings article (BiBTeX)";
 };
 String ST_TYPE_INBOOK
 {
@@ -49,7 +49,7 @@ String ST_TYPE_INCOLLECTION
 };
 String ST_TYPE_INPROCEEDINGS
 {
-Text [ en-US ] = "Conference proceedings";
+Text [ en-US ] = "Conference proceedings article";
 };
 String ST_TYPE_JOURNAL
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/find-invalid-help-embeds.sh

[Gabor Kelemen]

 helpers/find-invalid-help-embeds.sh |   56 
 1 file changed, 56 insertions(+)

New commits:
commit 75f5e0c62da711669d59f572c217b66a3f791b23
Author: Gabor Kelemen 
Date:   Wed Oct 12 14:39:16 2016 +0200

Script to check the validity of embed tags

This script looks up  tags in helpcontent, checks whether the
referenced file and id exist, and prints a warning if either one does not.
Execute from the root directory of the helpcontent2 repository.
No parameters are used.

Change-Id: Ic20bcfb1db398067231141b9af69c45590e1d452
Reviewed-on: https://gerrit.libreoffice.org/29732
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/helpers/find-invalid-help-embeds.sh 
b/helpers/find-invalid-help-embeds.sh
new file mode 100755
index 000..5c70fd5
--- /dev/null
+++ b/helpers/find-invalid-help-embeds.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This script looks up  tags in helpcontent, checks whether the
+# referenced file and id exist, and prints a warning if either one does not.
+# Execute from the root directory of the helpcontent2 repository.
+# No parameters are used.
+
+# Example output of this git grep:
+# source/text/sbasic/shared/0301.xhp:  
+lines=$(git grep "embed href=" source/);
+
+while read nextline ; do
+# source file is before the first :
+sourcefile=${nextline%%:*};
+# There may be more than one  in one line, split it up,
+# but first cut off everything before the first 
+processline="]*>\)');
+# Check if there is an " source/"$targetfile";
+if [ "$?" -ne "0" ] ; then
+echo "$sourcefile: In 'source/$targetfile' there is no 
section called '$targetsection'";
+fi
+else
+# target file does not exist
+echo "$sourcefile: Embedded target file 'source/$targetfile' 
does not exist!" ;
+fi
+fi
+# Remove the first xml tag from the parts still to be processed
+processline=${processline#<*>};
+# There may be characters after this, i.e. "foo "
+if [ -n "$processline" ] ; then
+processline="<${processline#*<}";
+fi
+done
+done <<< "$lines"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit dca5f8ad026115089620eab3fb361d9ea2f4c507
Author: Gabor Kelemen 
Date:   Wed Oct 12 14:39:16 2016 +0200

Updated core
Project: help  75f5e0c62da711669d59f572c217b66a3f791b23

Script to check the validity of embed tags

This script looks up  tags in helpcontent, checks whether the
referenced file and id exist, and prints a warning if either one does not.
Execute from the root directory of the helpcontent2 repository.
No parameters are used.

Change-Id: Ic20bcfb1db398067231141b9af69c45590e1d452
Reviewed-on: https://gerrit.libreoffice.org/29732
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/helpcontent2 b/helpcontent2
index d0edb88..75f5e0c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d0edb8833eae3f76869e8718c380e491f1d23419
+Subproject commit 75f5e0c62da711669d59f572c217b66a3f791b23
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basctl/source svx/Library_svxcore.mk svx/source

[Caolán McNamara]

 basctl/source/basicide/objdlg.cxx  |8 -
 basctl/source/basicide/objdlg.hrc  |1 
 basctl/source/basicide/objdlg.src  |5 -
 svx/Library_svxcore.mk |1 
 svx/source/form/ParseContext.cxx   |   15 +--
 svx/source/form/fmstring.src   |  137 +++--
 svx/source/form/stringlistresource.cxx |   50 
 svx/source/form/tabwin.cxx |   10 +-
 svx/source/inc/stringlistresource.hxx  |   58 -
 9 files changed, 46 insertions(+), 239 deletions(-)

New commits:
commit e510e9893d5ce99c8dfa9478d6972469fcc339d2
Author: Caolán McNamara 
Date:   Wed Oct 12 14:56:53 2016 +0100

de-src silly RID_TLB_MACROS resource

Change-Id: I0b1bd13b1d8408c2b8d83411beb36615612ddadc

diff --git a/basctl/source/basicide/objdlg.cxx 
b/basctl/source/basicide/objdlg.cxx
index 240b7e1..eb9a471 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -28,10 +28,10 @@
 namespace basctl
 {
 
-ObjectCatalog::ObjectCatalog (vcl::Window* pParent) :
-DockingWindow(pParent),
-aTitle(VclPtr::Create(this)),
-aTree(VclPtr::Create(this, IDEResId(RID_TLB_MACROS)))
+ObjectCatalog::ObjectCatalog (vcl::Window* pParent)
+: DockingWindow(pParent)
+, aTitle(VclPtr::Create(this))
+, aTree(VclPtr::Create(this, WB_TABSTOP))
 {
 SetHelpId("basctl:FloatingWindow:RID_BASICIDE_OBJCAT");
 SetText(IDEResId(RID_BASICIDE_OBJCAT).toString());
diff --git a/basctl/source/basicide/objdlg.hrc 
b/basctl/source/basicide/objdlg.hrc
index abf33a1..8b8a969 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -23,7 +23,6 @@
 
 #define RID_BASICIDE_OBJCAT ( RID_BASICIDE_START + 70 )
 #define RID_STR_TLB_MACROS  ( RID_BASICIDE_START + 71 )
-#define RID_TLB_MACROS  ( RID_BASICIDE_START + 72 )
 
 #endif // BASCTL_OBJDLG_HRR
 
diff --git a/basctl/source/basicide/objdlg.src 
b/basctl/source/basicide/objdlg.src
index 173f296..d66422c 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -19,11 +19,6 @@
 
 #include 
 
-Control RID_TLB_MACROS
-{
-TabStop = TRUE ;
-};
-
 String RID_BASICIDE_OBJCAT
 {
 Text [en-US] = "Object Catalog";
commit 1b3f3b75743f00d9e2b62446fc527b04abe0ea3b
Author: Caolán McNamara 
Date:   Wed Oct 12 14:50:34 2016 +0100

remove (yet another) StringListResource implementation

in favour of ResStringArray

Change-Id: I2d919bac0143d35f594ce2f4adad69b81d1bcb87

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 00ebc04..557c427 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -471,7 +471,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 svx/source/form/ParseContext \
 svx/source/form/sdbdatacolumn \
 svx/source/form/sqlparserclient \
-svx/source/form/stringlistresource \
 svx/source/form/typemap \
 svx/source/form/xfm_addcondition \
 svx/source/uitest/sdrobject \
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 758412c..b02413e 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -20,38 +20,36 @@
 
 #include 
 #include "svx/ParseContext.hxx"
-#include "stringlistresource.hxx"
 #include "svx/fmresids.hrc"
 
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
 using namespace svxform;
 using namespace ::connectivity;
 
-OSystemParseContext::OSystemParseContext() : IParseContext()
+OSystemParseContext::OSystemParseContext()
+: IParseContext()
 {
 SolarMutexGuard aGuard;
-
-svx::StringListResource aKeywords( SVX_RES( RID_RSC_SQL_INTERNATIONAL ) );
-aKeywords.get( m_aLocalizedKeywords );
+ResStringArray aLocalizedKeywords(SVX_RES(RID_RSC_SQL_INTERNATIONAL));
+for (sal_uInt32 i = 0; i < aLocalizedKeywords.Count(); ++i)
+m_aLocalizedKeywords.push_back(aLocalizedKeywords.GetString(i));
 }
 
-
 OSystemParseContext::~OSystemParseContext()
 {
 }
 
-
 css::lang::Locale OSystemParseContext::getPreferredLocale( ) const
 {
 return SvtSysLocale().GetLanguageTag().getLocale();
 }
 
-
 OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
 {
 OUString aMsg;
@@ -75,7 +73,6 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode 
_eCode) const
 return aMsg;
 }
 
-
 OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) 
const
 {
 size_t nIndex = 0;
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index b40cbf6..5ad484b 100644
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.src
@@ -55,19 +55,13 @@ String RID_STR_FORM
 {
 Text [ en-US ] = "Form";
 };
-Resource RID_RSC_TABWIN_PREFIX
+StringArray RID_RSC_TABWIN_PREFIX
 {
-String 1
+ItemList [ en-US ] =
 {
-Text [ en-US ] = "Table";
-};
-String 2
-{
-Text [ en-US ] = "Query";
-};

[Libreoffice-commits] core.git: helpcontent2

[Andras Timar]

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

New commits:
commit 19a6070b48abbd7450ddccfc8af809cca83781bf
Author: Andras Timar 
Date:   Wed Oct 12 14:11:40 2016 +0200

Updated core
Project: help  d0edb8833eae3f76869e8718c380e491f1d23419

remove old dmake related helper files

Change-Id: I71dc2ef7dfdbcfaf82e4ae3875fef7de62db0e64

diff --git a/helpcontent2 b/helpcontent2
index 988ace9..d0edb88 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 988ace944d9ec4991d7aa5fe22455fe9024e9aaf
+Subproject commit d0edb8833eae3f76869e8718c380e491f1d23419
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLForKit.cpp

[Tor Lillqvist]

 loolwsd/LOOLForKit.cpp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d658a35c039b7b231594bd72c85a9dd8bc81ae42
Author: Tor Lillqvist 
Date:   Wed Oct 12 15:15:39 2016 +0300

Fix copy-paste error

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 1ee1998..2122444 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -172,7 +172,7 @@ static bool haveCorrectCapabilities()
 result = false;
 if (!haveCapability(CAP_MKNOD))
 result = false;
-if (!haveCapability(CAP_SYS_CHROOT))
+if (!haveCapability(CAP_FOWNER))
 result = false;
 
 return result;
commit 7872c5f0837bd204add78615c358186cea7f7726
Author: Tor Lillqvist 
Date:   Wed Oct 12 15:13:26 2016 +0300

I mean loolforkit, not loolkit

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index fa03aaa..1ee1998 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -140,12 +140,12 @@ static bool haveCapability(cap_value_t capability)
 {
 if (cap_name)
 {
-Log::error("Capability " + std::string(cap_name) + " is not set 
for the loolkit program.");
+Log::error("Capability " + std::string(cap_name) + " is not set 
for the loolforkit program.");
 cap_free(cap_name);
 }
 else
 {
-Log::error("Capability " + std::to_string(capability) + " is not 
set for the loolkit program.");
+Log::error("Capability " + std::to_string(capability) + " is not 
set for the loolforkit program.");
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source codemaker/source forms/source idl/source include/rtl sal/qa

[Stephan Bergmann]

 chart2/source/tools/ExponentialRegressionCurveCalculator.cxx |2 -
 codemaker/source/javamaker/javatype.cxx  |2 -
 forms/source/xforms/model_ui.cxx |4 +-
 idl/source/prj/database.cxx  |9 +++---
 include/rtl/strbuf.hxx   |   15 ---
 include/rtl/ustrbuf.hxx  |   14 --
 sal/qa/rtl/strings/test_ostring_concat.cxx   |5 ---
 sal/qa/rtl/strings/test_oustring_concat.cxx  |3 --
 8 files changed, 11 insertions(+), 43 deletions(-)

New commits:
commit 802f2a420859f6787c86a960aa331245423d5820
Author: Stephan Bergmann 
Date:   Wed Oct 12 16:00:24 2016 +0200

Don't allow O[U]StringBuffer in string concatenation

...as

  OStringBuffer b("foo"); b = "bar" + b;

doesn't work as one might expect (see the mail thread starting at


"concat of OUStringBuffer".  That feature was LIBO_INTERNAL_ONLY, anyway.  
And
of the affected places, MethodDescriptor::getSignature
(codemaker/source/javamaker/javatype.cxx) was the only one that would 
actually
have benefitted.

Change-Id: Ib84266f43e40c42c2e428f0c0616db8cfa90adff

diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx 
b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 491f43a..d620576 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -205,7 +205,7 @@ OUString 
ExponentialRegressionCurveCalculator::ImplGetRepresentation(
 OUString aValueString = getFormattedString( xNumFormatter, 
nNumberFormatKey, m_fLogIntercept, pValueLength );
 if ( aValueString != "0" )  // aValueString may be rounded to 0 if 
nValueLength is small
 {
-aTmpBuf.append( aValueString + ( (m_fLogSlope < 0.0) ? 
OUStringBuffer(" ") : OUStringBuffer(" + ") ) );
+aTmpBuf.append( aValueString + ( (m_fLogSlope < 0.0) ? 
OUStringLiteral(" ") : OUStringLiteral(" + ") ) );
 }
 }
 }
diff --git a/codemaker/source/javamaker/javatype.cxx 
b/codemaker/source/javamaker/javatype.cxx
index 06328a9..1d414a1 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -329,7 +329,7 @@ public:
 
 OString getDescriptor() const;
 
-OString getSignature() const { return m_needsSignature ? m_signatureStart 
+ m_signatureEnd : OString();}
+OString getSignature() const { return m_needsSignature ? 
m_signatureStart.toString() + m_signatureEnd : OString();}
 
 private:
 rtl::Reference< TypeManager > m_manager;
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 482fe7a..f8f5784c 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -293,7 +293,7 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode,
 OUString sContent = xNode->getNodeValue();
 if( bDetail || ! lcl_isWhitespace( sContent ) )
 {
-aBuffer = aBuffer + "\"" + Convert::collapseWhitespace( 
sContent ) + "\"";
+aBuffer.append("\"" + Convert::collapseWhitespace( sContent ) 
+ "\"");
 }
 }
 break;
@@ -866,7 +866,7 @@ static OUString lcl_serializeForDisplay( const 
Reference& xResult
 break;
 
 case XPathObjectType_XPATH_STRING:
-aBuffer = aBuffer + "\"" + xResult->getString() + "\"";
+aBuffer.append("\"" + xResult->getString() + "\"");
 break;
 
 case XPathObjectType_XPATH_NODESET:
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index d001ee4..2b45e6e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -220,16 +220,16 @@ bool SvIdlDataBase::ReadIdFile( const OString& rOFileName 
)
 else if( rTok.Is( SvHash_include() ) )
 {
 rTok = aTokStm.GetToken_Next();
-OStringBuffer aName;
+OStringBuffer aNameBuf;
 if( rTok.IsString() )
-aName.append(rTok.GetString());
+aNameBuf.append(rTok.GetString());
 else if( rTok.IsChar() && rTok.GetChar() == '<' )
 {
 rTok = aTokStm.GetToken_Next();
 while( !rTok.IsEof()
   && !(rTok.IsChar() && rTok.GetChar() == '>') )
 {
-aName.append(rTok.GetTokenAsString());
+aNameBuf.append(rTok.GetTokenAsString());
 rTok = aTokStm.GetToken_Next();
 }
  

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

[Samuel Mehrbrodt]

 svx/source/dialog/SafeModeDialog.cxx |   39 ++-
 svx/source/dialog/SafeModeDialog.hxx |4 +++
 svx/source/dialog/crashreportdlg.cxx |   22 +++
 svx/source/dialog/crashreportdlg.hxx |2 +
 4 files changed, 57 insertions(+), 10 deletions(-)

New commits:
commit a8030ce8be1c6d7dca9159374fc875c7165b6e41
Author: Samuel Mehrbrodt 
Date:   Wed Oct 12 15:27:14 2016 +0200

CrashReportDialog: Enter safemode only after sending crash report

Change-Id: I2c78431f839050ca74b082f7c790d0c59fba6513

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 1692a44..ed56b67 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -60,6 +60,19 @@ void CrashReportDialog::dispose()
 Dialog::dispose();
 }
 
+bool CrashReportDialog::Close()
+{
+// Check whether to go to safe mode
+if (mpCBSafeMode->IsChecked())
+{
+sfx2::SafeMode::putFlag();
+
css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext())->requestRestart(
+css::uno::Reference< css::task::XInteractionHandler >());
+}
+
+return Dialog::Close();
+}
+
 IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 {
 if (pBtn == mpBtnSend.get())
@@ -101,15 +114,6 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 {
 Close();
 }
-
-// Check whether to go to safe mode
-if (mpCBSafeMode->IsChecked())
-{
-sfx2::SafeMode::putFlag();
-css::uno::Reference< css::uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
-css::task::OfficeRestartManager::get(xContext)->requestRestart(
-css::uno::Reference< css::task::XInteractionHandler >());
-}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/source/dialog/crashreportdlg.hxx
index ecdd445..b001436 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -26,6 +26,8 @@ public:
 
 virtual void dispose() override;
 
+virtual bool Close() override;
+
 private:
 
 VclPtr mpBtnSend;
commit a9b56780cec06ca9545b2ba554e405fe061fed57
Author: Samuel Mehrbrodt 
Date:   Wed Oct 12 13:35:52 2016 +0200

SafeModeDialog: Enable restart button only for active selections

Change-Id: Ic5c9d1a0001e8324aa007c3f7bc0e58e13afbbbf

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index 46e9d2f..1da58a0 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -35,6 +35,13 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent):
 mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
 mpBtnQuit->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
 mpBtnRestart->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
+
+mpCBCustomizations->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
+mpCBExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
+mpCBFull->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
+
+// Disable restart btn until some checkbox is active
+mpBtnRestart->Disable();
 }
 
 SafeModeDialog::~SafeModeDialog()
@@ -94,4 +101,10 @@ IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void)
 }
 }
 
+IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, /*pCheckBox*/, void)
+{
+bool bEnable = mpCBCustomizations->IsChecked() || 
mpCBExtensions->IsChecked() || mpCBFull->IsChecked();
+mpBtnRestart->Enable(bEnable);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeModeDialog.hxx 
b/svx/source/dialog/SafeModeDialog.hxx
index 44e6b18..dd0036e 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -41,6 +41,7 @@ private:
 static void terminateOffice();
 static void applyChanges();
 
+DECL_LINK(CheckBoxHdl, CheckBox&, void);
 DECL_LINK(BtnHdl, Button*, void);
 };
 
commit 9e30dcd46d2ad31be6a9dcafaa6505e8301b8694
Author: Samuel Mehrbrodt 
Date:   Wed Oct 12 13:26:10 2016 +0200

SafeModeDialog: Handle restart button event

Change-Id: I6b55f79ea153aaeb8b67879bdafb6774fd91455c

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index 9358177..46e9d2f 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -17,6 +17,8 @@
 
 #include 
 #include 
+#include 
+#include 
 
 using namespace css;
 
@@ -66,6 +68,15 @@ void SafeModeDialog::terminateOffice()
 xDesktop->terminate();
 }
 
+void SafeModeDialog::applyChanges()
+{
+// TODO: Apply apply changes
+
+// Then restart
+
css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext())->requestRestart(
+css::uno::Reference< 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLForKit.cpp

[Tor Lillqvist]

 loolwsd/LOOLForKit.cpp |   72 +
 1 file changed, 72 insertions(+)

New commits:
commit 36895fa2ca9ab8addb2307c6eb30dbebed496143
Author: Tor Lillqvist 
Date:   Wed Oct 12 14:19:42 2016 +0300

Verify at run-time that the loolforkit program has the required capabilities

If not, log a mesage and exit.

Check the capabilities only after opening the fifo. loolwsd is waiting
in open() for loolforkit to open its end of the pipe, so if loolforkit
exits before it has opened the pipe, loolwsd will wait forever and not
notice that loolforkit has exited. Which is not ideal.

Note that there are other sanity checks done before loolforkit opens
the pipe, and if some of them fail, and loolforkit exits, loolwsd will
be hanging in the open and not notice. Need to carefully look through
that and re-factor as necessary.

Using a named pipe (FIFO) is probably pointless. We should just create
a normal pipe in loolwsd and pass the fd of the reading end on the
command-line to loolforkit.

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 1c4144e..eaa3c9a 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -113,6 +113,75 @@ private:
 }
 };
 
+static bool haveCapability(cap_value_t capability)
+{
+cap_t caps = cap_get_proc();
+
+if (caps == nullptr)
+{
+Log::syserror("cap_get_proc() failed.");
+return false;
+}
+
+char *cap_name = cap_to_name(capability);
+cap_flag_value_t value;
+
+if (cap_get_flag(caps, capability, CAP_EFFECTIVE, ) == -1)
+{
+if (cap_name)
+{
+Log::syserror("cap_get_flag failed for " + std::string(cap_name) + 
".");
+cap_free(cap_name);
+}
+else
+{
+Log::syserror("cap_get_flag failed for capability " + 
std::to_string(capability) + ".");
+}
+return false;
+}
+
+if (value != CAP_SET)
+{
+if (cap_name)
+{
+Log::error("Capability " + std::string(cap_name) + " is not set 
for the loolforkit program.");
+cap_free(cap_name);
+}
+else
+{
+Log::error("Capability " + std::to_string(capability) + " is not 
set for the loolforkit program.");
+}
+return false;
+}
+
+if (cap_name)
+{
+Log::info("Have capability " + std::string(cap_name));
+cap_free(cap_name);
+}
+else
+{
+Log::info("Have capability " + std::to_string(capability));
+}
+
+return true;
+}
+
+static bool haveCorrectCapabilities()
+{
+bool result = true;
+
+// Do check them all, don't shortcut with &&
+if (!haveCapability(CAP_SYS_CHROOT))
+result = false;
+if (!haveCapability(CAP_MKNOD))
+result = false;
+if (!haveCapability(CAP_FOWNER))
+result = false;
+
+return result;
+}
+
 /// Check if some previously forked kids have died.
 static void cleanupChildren()
 {
@@ -304,6 +373,9 @@ int main(int argc, char** argv)
 }
 Log::debug("open(" + pipeLoolwsd + ", RDONLY) = " + 
std::to_string(pipeFd));
 
+if (!haveCorrectCapabilities())
+return Application::EXIT_SOFTWARE;
+
 // Initialize LoKit
 if (!globalPreinit(loTemplate))
 std::_Exit(Application::EXIT_SOFTWARE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 570669631359021a8ad420753c87bcf4419d06cd
Author: Caolán McNamara 
Date:   Wed Oct 12 21:17:43 2016 +0100

Related: tdf#92776 set parent style of notebook to toplevel window style

Change-Id: Iec16b2617c82c363a540f967f66c514b5b2b104b

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index b285d51..b904dfc 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2427,7 +2427,7 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, 
GtkWidget *pWindow )
 mpSpinDownStyle = createStyleContext(GtkControlPart::SpinButtonDownButton, 
mpSpinStyle);
 
 /* NoteBook */
-mpNotebookStyle = createStyleContext(GtkControlPart::Notebook);
+mpNotebookStyle = createStyleContext(GtkControlPart::Notebook, 
gtk_widget_get_style_context(mpWindow));
 mpNotebookStackStyle = createStyleContext(GtkControlPart::NotebookStack, 
mpNotebookStyle);
 mpNotebookHeaderStyle = createStyleContext(GtkControlPart::NotebookHeader, 
mpNotebookStyle);
 mpNotebookHeaderTabsStyle = 
createStyleContext(GtkControlPart::NotebookHeaderTabs, mpNotebookHeaderStyle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/source filter/source

[Noel Grandin]

 extensions/source/dbpilots/listcombowizard.cxx   |5 -
 extensions/source/dbpilots/listcombowizard.hxx   |3 ---
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |5 -
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx |2 --
 4 files changed, 15 deletions(-)

New commits:
commit 90021d3d3b8d42ee8b8b1af86d4c1880a29d39ef
Author: Noel Grandin 
Date:   Tue Oct 11 11:15:25 2016 +0200

loplugin:unnecessaryoverride in extensions..filter

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

diff --git a/extensions/source/dbpilots/listcombowizard.cxx 
b/extensions/source/dbpilots/listcombowizard.cxx
index 10087cf..a53288b 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -372,11 +372,6 @@ namespace dbp
 OLCPage::dispose();
 }
 
-void OContentFieldSelection::ActivatePage()
-{
-OLCPage::ActivatePage();
-}
-
 
 void OContentFieldSelection::initializePage()
 {
diff --git a/extensions/source/dbpilots/listcombowizard.hxx 
b/extensions/source/dbpilots/listcombowizard.hxx
index 6a4d748..5cc6555 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -134,9 +134,6 @@ namespace dbp
 DECL_LINK( OnFieldSelected, ListBox&, void );
 DECL_LINK( OnTableDoubleClicked, ListBox&, void );
 
-// TabPage overridables
-virtual void ActivatePage() override;
-
 // OWizardPage overridables
 virtual voidinitializePage() override;
 virtual boolcommitPage( ::svt::WizardTypes::CommitPageReason 
_eReason ) override;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 1c5a411..d4186ed 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1431,11 +1431,6 @@ void XMLFilterListBox::dispose()
 SvTabListBox::dispose();
 }
 
-void XMLFilterListBox::Paint(vcl::RenderContext& rRenderContext, const 
Rectangle& rRect)
-{
-SvTabListBox::Paint(rRenderContext, rRect);
-}
-
 IMPL_LINK_NOARG( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTreeListBox*, void )
 {
 m_pHeaderBar->SetOffset( -GetXOffset() );
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index f1e2b58..40f2698 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -76,8 +76,6 @@ public:
 void addFilterEntry( const filter_info_impl* pInfo );
 
 void changeEntry( const filter_info_impl* pInfo );
-
-virtual voidPaint( vcl::RenderContext& rRenderContext, const 
Rectangle& rRect ) override;
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools

[Jochen Nitschke]

 include/tools/ref.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 41683b9a8581445fef09e7a25ad35e58fc5602be
Author: Jochen Nitschke 
Date:   Tue Oct 11 16:27:38 2016 +0200

use more 'nullptr' in SvRef templates

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

diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index c8db2bd..ff7175b 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -67,7 +67,7 @@ public:
 
 SvRef & operator =(SvRef const & rObj)
 {
-if (rObj.pObj != 0) {
+if (rObj.pObj != nullptr) {
 rObj.pObj->AddNextRef();
 }
 T * pRefObj = pObj;
@@ -218,13 +218,13 @@ public:
 inline   SvCompatWeakRef( T* pObj )
  {  if( pObj ) _xHdl = pObj->GetHdl(); }
 inline SvCompatWeakRef& operator = ( T * pObj )
- {  _xHdl = pObj ? pObj->GetHdl() : 0; return *this; }
+ {  _xHdl = pObj ? pObj->GetHdl() : nullptr; return 
*this; }
 inline bool  Is() const
  { return _xHdl.Is() && _xHdl->GetObj(); }
 inline T*operator -> () const
- { return _xHdl.Is() ? _xHdl->GetObj() : 0; }
+ { return _xHdl.Is() ? _xHdl->GetObj() : nullptr; }
 inline operator T* () const
- { return _xHdl.Is() ? _xHdl->GetObj() : 0; }
+ { return _xHdl.Is() ? _xHdl->GetObj() : nullptr; }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 sw/source/uibase/dbui/dbmgr.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit eadfda64c14f8c78b5d6a30c21432148c41d5651
Author: Jochen Nitschke 
Date:   Tue Oct 11 23:19:14 2016 +0200

convert macro to local function

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

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 2bf4ed9..2f74292 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -155,10 +155,6 @@ const sal_Char cDataSourceName[] = "DataSourceName";
 const sal_Char cSelection[] = "Selection";
 const sal_Char cActiveConnection[] = "ActiveConnection";
 
-#define EMIT_SW_EVENT(type, shell) \
-SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_##type, \
-SwDocShell::GetEventName(STR_SW_EVENT_##type), shell))
-
 namespace {
 
 void rescheduleGui() {
@@ -166,6 +162,13 @@ void rescheduleGui() {
 Application::Reschedule();
 }
 
+void lcl_emitEvent(sal_uInt16 nEventId, sal_Int32 nStrId, SfxObjectShell* 
pDocShell)
+{
+SfxGetpApp()->NotifyEvent(SfxEventHint(nEventId,
+   SwDocShell::GetEventName(nStrId),
+   pDocShell));
+}
+
 }
 
 enum class SwDBNextRecord { NEXT, FIRST };
@@ -1395,7 +1398,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 pWorkShell->CalcLayout();
 }
 
-EMIT_SW_EVENT(FIELD_MERGE, xWorkDocSh);
+lcl_emitEvent(SW_EVENT_FIELD_MERGE, STR_SW_EVENT_FIELD_MERGE, 
xWorkDocSh);
 
 // tdf#92324: Allow ExpFields update only by explicit instruction 
to avoid
 // database cursor movement on any other fields update, for 
example during
@@ -1405,7 +1408,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 pWorkShell->SwViewShell::UpdateFields();
 pWorkShell->LockExpFields();
 
-EMIT_SW_EVENT(FIELD_MERGE_FINISHED, xWorkDocSh);
+lcl_emitEvent(SW_EVENT_FIELD_MERGE_FINISHED, 
STR_SW_EVENT_FIELD_MERGE_FINISHED, xWorkDocSh);
 
 // also emit MailMergeEvent on XInterface if possible
 const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc();
@@ -2865,7 +2868,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh,
 // SfxObjectShellRef is ok, since there should be no control over the 
document lifetime here
 SfxObjectShellRef xDocShell = 
rSh.GetView().GetViewFrame()->GetObjectShell();
 
-EMIT_SW_EVENT(MAIL_MERGE, xDocShell.get());
+lcl_emitEvent(SW_EVENT_MAIL_MERGE, STR_SW_EVENT_MAIL_MERGE, 
xDocShell.get());
 
 // prepare mail merge descriptor
 SwMergeDescriptor aMergeDesc( pImpl->pMergeDialog->GetMergeType(), 
rSh, aDescriptor );
@@ -2879,7 +2882,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh,
 
 Merge( aMergeDesc );
 
-EMIT_SW_EVENT(MAIL_MERGE_END, xDocShell.get());
+lcl_emitEvent(SW_EVENT_MAIL_MERGE_END, STR_SW_EVENT_MAIL_MERGE_END, 
xDocShell.get());
 
 // reset the cursor inside
 xResSet = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 11 commits - compilerplugins/clang sc/inc sc/qa sc/source sd/source

[Noel Grandin]

 compilerplugins/clang/refcounting.cxx   |3 
 sc/inc/fillinfo.hxx |   29 +++---
 sc/inc/formularesult.hxx|8 -
 sc/inc/patattr.hxx  |3 
 sc/inc/scmatrix.hxx |   18 +--
 sc/inc/types.hxx|   18 ++-
 sc/qa/unit/ucalc.cxx|   16 +--
 sc/source/core/data/column2.cxx |4 
 sc/source/core/data/patattr.cxx |   14 +--
 sc/source/core/data/table2.cxx  |   10 +-
 sc/source/core/tool/chartpos.cxx|   33 +++
 sc/source/core/tool/formularesult.cxx   |   24 ++---
 sc/source/core/tool/interpr1.cxx|   10 +-
 sc/source/core/tool/interpr2.cxx|   12 +-
 sc/source/core/tool/interpr4.cxx|2 
 sc/source/core/tool/scmatrix.cxx|   12 +-
 sc/source/filter/excel/colrowst.cxx |   55 +--
 sc/source/filter/excel/xehelper.cxx |4 
 sc/source/filter/excel/xelink.cxx   |   45 -
 sc/source/filter/excel/xilink.cxx   |6 -
 sc/source/filter/inc/colrowst.hxx   |   23 +++--
 sc/source/filter/inc/xelink.hxx |   24 -
 sc/source/ui/dbgui/csvcontrol.cxx   |   22 ++--
 sc/source/ui/dbgui/csvgrid.cxx  |   16 +--
 sc/source/ui/dbgui/csvruler.cxx |   10 +-
 sc/source/ui/inc/csvcontrol.hxx |   40 
 sc/source/ui/inc/gridwin.hxx|3 
 sc/source/ui/view/gridwin.cxx   |   16 +--
 sc/source/ui/view/output.cxx|   44 -
 sc/source/ui/view/output2.cxx   |   16 +--
 sd/source/ui/animations/CustomAnimationPane.cxx |   25 ++---
 sd/source/ui/animations/SlideTransitionPane.cxx |   26 ++---
 sd/source/ui/annotations/annotationmanager.cxx  |   18 ++-
 sd/source/ui/inc/EventMultiplexer.hxx   |   92 ++--
 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx |   33 +++
 sd/source/ui/sidebar/LayoutMenu.cxx |   24 ++---
 sd/source/ui/sidebar/SlideBackground.cxx|   30 +++---
 sd/source/ui/slidesorter/controller/SlsListener.cxx |   38 
 sd/source/ui/table/TableDesignPane.cxx  |   20 ++--
 sd/source/ui/tools/EventMultiplexer.cxx |   66 ++
 sd/source/ui/view/FormShellManager.cxx  |   12 +-
 sd/source/ui/view/ToolBarManager.cxx|   14 +--
 sd/source/ui/view/outlview.cxx  |   10 +-
 sd/source/ui/view/sdview.cxx|4 
 sd/source/ui/view/viewoverlaymanager.cxx|   21 ++--
 45 files changed, 504 insertions(+), 469 deletions(-)

New commits:
commit 942716fee138b68c2af9411384f402b5692a88b2
Author: Noel Grandin 
Date:   Wed Oct 12 08:43:44 2016 +0200

convert EID constants to typed_flags

Change-Id: I3bcccd8836e54dd33bb079856226fbedd574c824

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index b5dbe2d..6c363c9 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -310,12 +310,12 @@ void CustomAnimationPane::addListener()
 Link aLink( 
LINK(this,CustomAnimationPane,EventMultiplexerListener) );
 mrBase.GetEventMultiplexer()->AddEventListener (
 aLink,
-tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
-| tools::EventMultiplexerEvent::EID_CURRENT_PAGE
-| tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
-| tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
-| tools::EventMultiplexerEvent::EID_DISPOSING
-| tools::EventMultiplexerEvent::EID_END_TEXT_EDIT);
+EventMultiplexerEventId::EditViewSelection
+| EventMultiplexerEventId::CurrentPageChanged
+| EventMultiplexerEventId::MainViewRemoved
+| EventMultiplexerEventId::MainViewAdded
+| EventMultiplexerEventId::Disposing
+| EventMultiplexerEventId::EndTextEdit);
 }
 
 void CustomAnimationPane::removeListener()
@@ -329,15 +329,15 @@ IMPL_LINK(CustomAnimationPane,EventMultiplexerListener,
 {
 switch (rEvent.meEventId)
 {
-case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION:
+case EventMultiplexerEventId::EditViewSelection:
 onSelectionChanged();
 break;
 
-case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
+case EventMultiplexerEventId::CurrentPageChanged:
 onChangeCurrentPage();
 break;
 
-case 

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

[Stephan Bergmann]

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

New commits:
commit da95ad47af1f345a208a816fd3a641bc47c4b32c
Author: Stephan Bergmann 
Date:   Wed Oct 12 08:49:35 2016 +0200

typo

Change-Id: Iea55eee0e5e777e46bb02435f10bca03e554a15c

diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index ffbe478..cc3a56b 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -341,7 +341,7 @@ void RefCounting::checkUnoReference(QualType qt, const 
Decl* decl, const std::st
 "uno::Reference " + rDeclName + " with template parameter that 
does not contain ::static_type() "
 + qt.getAsString()
 + ", parent is " + rParentName
-+ ", should probably be using rtl::Reference instead"
++ ", should probably be using rtl::Reference instead",
 decl->getLocation())
   << decl->getSourceRange();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 reportdesign/source/ui/inspection/GeometryHandler.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c76f90da1c54cd497c6dce6bdaeeb919f2cbe82b
Author: Stephan Bergmann 
Date:   Wed Oct 12 17:22:33 2016 +0200

loplugin:unusedvariablecheck

Change-Id: I945e4d4a3848886c061b7a29bd277a1e6c6a7505

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 214b6a5..d0a8180 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -935,7 +935,6 @@ uno::Any GeometryHandler::getConstantValue(bool 
_bToControlValue,sal_uInt16 _nRe
 {
 ModuleRes aRes(_nResId);
 ResStringArray aResList(aRes);
-std::vector aList;
 uno::Sequence< OUString > aSeq(aResList.Count());
 for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
 aSeq[i] = aResList.GetString(i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loleaflet/src loolwsd/LOOLWSD.cpp loolwsd/test loolwsd/UserMessages.hpp

[Henry Castro]

 loleaflet/dist/errormessages.js |1 +
 loleaflet/src/core/Socket.js|4 
 loolwsd/LOOLWSD.cpp |   15 +--
 loolwsd/UserMessages.hpp|4 ++--
 loolwsd/test/httpwstest.cpp |6 ++
 5 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 5a2fe805dbd2ea0be5255ebfe219f1f8ff2a93e1
Author: Henry Castro 
Date:   Wed Oct 12 11:52:29 2016 -0400

loleaflet: add localizable error message

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index 625f017..47a81fa 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -2,3 +2,4 @@ exports.wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid 
encoded URI, or fi
 exports.emptyhosturl = _('The host URL is empty. The loolwsd server is 
probably misconfigured, please contact the administrator.');
 exports.diskfull = _('No disk space left on server, please contact the server 
administrator to continue.');
 exports.limitreached = _('This development build is limited to %0 documents, 
and %1 connections - to avoid the impression that it is suitable for deployment 
in large enterprises. To find out more about deploying and scaling %2 checkout: 
%3.');
+exports.serviceunavailable = _('Service is unavailable. Please try again later 
and report to your administrator if the issue persists.');
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 34608e9..1e44434 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -209,6 +209,10 @@ L.Socket = L.Class.extend({
textMsg = textMsg.replace(/%2/g, (typeof 
brandProductName !== 'undefined' ? brandProductName : 'LibreOffice Online'));
textMsg = textMsg.replace(/%3/g, (typeof 
brandProductURL !== 'undefined' ? brandProductURL : 
'https://wiki.documentfoundation.org/Development/LibreOffice_Online'));
}
+   else if (command.errorKind === 'serviceunavailable') {
+   this._map._fatal = true;
+   textMsg = errorMessages.serviceunavailable;
+   }
this._map.fire('error', {msg: textMsg});
}
else if (textMsg.startsWith('pong ') && this._map._docLayer && 
this._map._docLayer._debug) {
commit bd5e138aa9831b32d30711974d3c1eb7f191bf2c
Author: Henry Castro 
Date:   Wed Oct 12 11:15:32 2016 -0400

loolwsd: fix error message localization

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8b6e601..01b7b2a 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -183,7 +183,7 @@ namespace {
 static inline
 void shutdownLimitReached(WebSocket& ws)
 {
-const std::string error = Poco::format(PAYLOAD_UNAVALABLE_LIMIT_REACHED, 
MAX_DOCUMENTS, MAX_CONNECTIONS);
+const std::string error = Poco::format(PAYLOAD_UNAVAILABLE_LIMIT_REACHED, 
MAX_DOCUMENTS, MAX_CONNECTIONS);
 
 /* loleaflet sends loolclient, load and partrectangles message immediately
after web socket handshake, so closing web socket fails loading page in
@@ -395,7 +395,7 @@ private:
 {
 // Let the client know we can't serve now.
 Log::error(session->getName() + ": Failed to connect to lokit 
process. Client cannot serve now.");
-throw 
WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
+throw 
WebSocketErrorMessageException(SERVICE_UNAVAILABLE_INTERNAL_ERROR);
 }
 
 Log::debug("Waiting child session permission, done!");
@@ -727,7 +727,7 @@ private:
 {
 // Let the client know we can't serve now.
 Log::error("Failed to get new child. Service Unavailable.");
-throw 
WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
+throw 
WebSocketErrorMessageException(SERVICE_UNAVAILABLE_INTERNAL_ERROR);
 }
 
 #if MAX_DOCUMENTS > 0
@@ -760,7 +760,7 @@ private:
 #endif
 }
 
-throw 
WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
+throw 
WebSocketErrorMessageException(SERVICE_UNAVAILABLE_INTERNAL_ERROR);
 }
 
 // Validate the URI and Storage before moving on.
@@ -878,6 +878,10 @@ private:
 LOOLWSD::dumpEventTrace(docBroker->getJailId(), id, "EndSession: " 
+ uri);
 Log::info("Finishing GET request handler for session [" + id + 
"].");
 }
+catch (const WebSocketErrorMessageException&)
+{
+throw;
+}
 catch (const std::exception& exc)
 {
 Log::error("Error in client request handler: " + 
std::string(exc.what()));
@@ -1048,8 +1052,7 @@ public:
 
Log::error(std::string("ClientRequestHandler::handleRequest: 
WebSocketErrorMessageException: ") + 

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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit d3645961d98ce9f0cfb1ef7f0aba7bf020b90945
Author: Eike Rathke 
Date:   Wed Oct 12 19:47:44 2016 +0200

create NoName error token instead of setting error at the token array

... when handling name token. This can happen when importing BIFF .xls and 
the
original range is not present in the document. The document is broken, but 
such
formula can continue to work if the range expression was not actually 
executed,
for example IF(TRUE(),then_good,else_bad_range) where else_bad_range is 
#NAME?
error.

Change-Id: I823ac89115418cf5069b2baf5c5de2c814319ae7

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 589bb9b..834c7ab 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4659,6 +4659,7 @@ ScRangeData* ScCompiler::GetRangeData( const 
FormulaToken& rToken ) const
 
 bool ScCompiler::HandleRange()
 {
+ScTokenArray* pNew;
 const ScRangeData* pRangeData = GetRangeData( *mpToken);
 if (pRangeData)
 {
@@ -4667,7 +4668,6 @@ bool ScCompiler::HandleRange()
 SetError( FormulaError::NoName );
 else if (mbJumpCommandReorder)
 {
-ScTokenArray* pNew;
 // put named formula into parentheses.
 // But only if there aren't any yet, parenthetical
 // ocSep doesn't work, e.g. SUM((...;...))
@@ -4716,7 +4716,15 @@ bool ScCompiler::HandleRange()
 }
 }
 else
-SetError(FormulaError::NoName);
+{
+// No ScRangeData for an already compiled token can happen in BIFF .xls
+// import if the original range is not present in the document.
+pNew = new ScTokenArray;
+pNew->Add( new FormulaErrorToken( FormulaError::NoName));
+PushTokenArray( pNew, true );
+pNew->Reset();
+return GetToken();
+}
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/IoUtil.cpp loolwsd/IoUtil.hpp loolwsd/LOOLWSD.cpp

[Tor Lillqvist]

 loolwsd/IoUtil.cpp  |8 
 loolwsd/IoUtil.hpp  |8 
 loolwsd/LOOLWSD.cpp |2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit dc7f5614819f95856dec6ae3322a6763bf21c323
Author: Tor Lillqvist 
Date:   Wed Oct 12 19:07:54 2016 +0300

Don't use 'FIFO' in function names as we don't use FIFOs any more

No functional changes.

diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index bb861dd..1160b15 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -214,7 +214,7 @@ void shutdownWebSocket(const 
std::shared_ptr& ws)
 
 }
 
-ssize_t writeFIFO(int pipe, const char* buffer, ssize_t size)
+ssize_t writeToPipe(int pipe, const char* buffer, ssize_t size)
 {
 ssize_t count = 0;
 while(true)
@@ -244,7 +244,7 @@ ssize_t writeFIFO(int pipe, const char* buffer, ssize_t 
size)
 return count;
 }
 
-ssize_t readFIFO(int pipe, char* buffer, ssize_t size)
+ssize_t readFromPipe(int pipe, char* buffer, ssize_t size)
 {
 ssize_t bytes;
 do
@@ -302,8 +302,8 @@ int PipeReader::readLine(std::string& line,
 else if (pipe.revents & (POLLIN | POLLPRI))
 {
 char buffer[READ_BUFFER_SIZE];
-const auto bytes = readFIFO(_pipe, buffer, sizeof(buffer));
-Log::trace() << "readFIFO for pipe: " << _name << " returned: " << 
bytes << Log::end;
+const auto bytes = readFromPipe(_pipe, buffer, sizeof(buffer));
+Log::trace() << "readFromPipe for pipe: " << _name << " returned: 
" << bytes << Log::end;
 if (bytes < 0)
 {
 return -1;
diff --git a/loolwsd/IoUtil.hpp b/loolwsd/IoUtil.hpp
index a213497..69819c2 100644
--- a/loolwsd/IoUtil.hpp
+++ b/loolwsd/IoUtil.hpp
@@ -36,14 +36,14 @@ namespace IoUtil
 /// Call WebSocket::shutdown() ignoring Poco::IOException.
 void shutdownWebSocket(const std::shared_ptr& ws);
 
-ssize_t writeFIFO(int pipe, const char* buffer, ssize_t size);
+ssize_t writeToPipe(int pipe, const char* buffer, ssize_t size);
 inline
-ssize_t writeFIFO(int pipe, const std::string& message)
+ssize_t writeToPipe(int pipe, const std::string& message)
 {
-return writeFIFO(pipe, message.c_str(), message.size());
+return writeToPipe(pipe, message.c_str(), message.size());
 }
 
-ssize_t readFIFO(int pipe, char* buffer, ssize_t size);
+ssize_t readFromPipe(int pipe, char* buffer, ssize_t size);
 
 /// Helper class to handle reading from a pipe.
 class PipeReader
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8b3cec2..8b6e601 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -228,7 +228,7 @@ static void forkChildren(const int number)
 Util::checkDiskSpaceOnRegisteredFileSystems();
 const std::string aMessage = "spawn " + std::to_string(number) + "\n";
 Log::debug("MasterToForKit: " + aMessage.substr(0, aMessage.length() - 
1));
-IoUtil::writeFIFO(LOOLWSD::ForKitWritePipe, aMessage);
+IoUtil::writeToPipe(LOOLWSD::ForKitWritePipe, aMessage);
 lastForkRequestTime = std::chrono::steady_clock::now();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/Common.hpp loolwsd/LOOLForKit.cpp loolwsd/LOOLWSD.cpp

[Tor Lillqvist]

 loolwsd/Common.hpp |2 --
 loolwsd/LOOLForKit.cpp |   21 +++--
 loolwsd/LOOLWSD.cpp|   33 +++--
 3 files changed, 10 insertions(+), 46 deletions(-)

New commits:
commit 58f78f8734b908c738eab8ec6a7eccaebd5ba2ee
Author: Tor Lillqvist 
Date:   Wed Oct 12 18:15:13 2016 +0300

Don't use named pipes (FIFOs)

Use a plain pipe, as created by Poco::Process::launch() when you pass
a non-nullptr inPipe pointer to it. Leads to simpler code. No need to
explicitly create a FIFO and open it. In loolforkit, the read fd of
the pipe is now always 0 (stdin).

Creating the pipe ourselves in loolwsd using pipe() and passing the fd
of the read end of the pipe on the loolforkit command-line would not
be much more complex, and was what I first tried. But it did not work,
as Poco::ProcessImpl::launchByForkExecImpl() closes all file
descriptors >= 3. Which is a bit rude, and not documented, but there
you go.

diff --git a/loolwsd/Common.hpp b/loolwsd/Common.hpp
index 3e5d5e9..68530e8 100644
--- a/loolwsd/Common.hpp
+++ b/loolwsd/Common.hpp
@@ -32,8 +32,6 @@ constexpr int READ_BUFFER_SIZE = 2048;
 /// size are considered small messages.
 constexpr int SMALL_MESSAGE_SIZE = READ_BUFFER_SIZE / 2;
 
-constexpr auto FIFO_LOOLWSD = "loolwsdfifo";
-constexpr auto FIFO_PATH = "pipe";
 constexpr auto JAILED_DOCUMENT_ROOT = "/user/docs/";
 constexpr auto CHILD_URI = "/loolws/child?";
 constexpr auto NEW_CHILD_URI = "/loolws/newchild?";
diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 2122444..c27e001 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -55,8 +55,6 @@ static std::map childJails;
 int ClientPortNumber = DEFAULT_CLIENT_PORT_NUMBER;
 int MasterPortNumber = DEFAULT_MASTER_PORT_NUMBER;
 
-static int pipeFd = -1;
-
 /// Dispatcher class to demultiplex requests from
 /// WSD and handles them.
 class CommandDispatcher : public IoUtil::PipeReader
@@ -209,9 +207,8 @@ static int createLibreOfficeKit(const std::string& 
childRoot,
 Process::PID pid;
 if (!(pid = fork()))
 {
-// quicker than a generic socket closing approach.
-// (but pipeFd is a pipe, not a socket...?)
-close(pipeFd);
+// Close the pipe from loolwsd
+close(0);
 
 UnitKit::get().postFork();
 
@@ -366,16 +363,6 @@ int main(int argc, char** argv)
 if (!std::getenv("LD_BIND_NOW"))
 Log::info("Note: LD_BIND_NOW is not set.");
 
-// Open read fifo pipe with WSD.
-const Path pipePath = Path::forDirectory(childRoot + "/" + FIFO_PATH);
-const std::string pipeLoolwsd = Path(pipePath, FIFO_LOOLWSD).toString();
-if ( (pipeFd = open(pipeLoolwsd.c_str(), O_RDONLY) ) < 0 )
-{
-Log::syserror("Failed to open pipe [" + pipeLoolwsd + "] for reading. 
Exiting.");
-std::_Exit(Application::EXIT_SOFTWARE);
-}
-Log::debug("open(" + pipeLoolwsd + ", RDONLY) = " + 
std::to_string(pipeFd));
-
 if (!haveCorrectCapabilities())
 return Application::EXIT_SOFTWARE;
 
@@ -393,7 +380,7 @@ int main(int argc, char** argv)
 std::_Exit(Application::EXIT_SOFTWARE);
 }
 
-CommandDispatcher commandDispatcher(pipeFd);
+CommandDispatcher commandDispatcher(0);
 Log::info("ForKit process is ready.");
 
 while (!TerminationFlag)
@@ -434,8 +421,6 @@ int main(int argc, char** argv)
 }
 }
 
-close(pipeFd);
-
 int returnValue = Application::EXIT_OK;
 UnitKit::get().returnValue(returnValue);
 
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index cb5e94f..8b3cec2 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -78,6 +78,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -133,6 +134,7 @@ using Poco::Net::ServerSocket;
 using Poco::Net::SocketAddress;
 using Poco::Net::WebSocket;
 using Poco::Path;
+using Poco::Pipe;
 using Poco::Process;
 using Poco::ProcessHandle;
 using Poco::StreamCopier;
@@ -1848,7 +1850,11 @@ Process::PID LOOLWSD::createForKit()
   Poco::cat(std::string(" "), args.begin(), args.end()));
 
 lastForkRequestTime = std::chrono::steady_clock::now();
-ProcessHandle child = Process::launch(forKitPath, args);
+Pipe inPipe;
+ProcessHandle child = Process::launch(forKitPath, args, , nullptr, 
nullptr);
+
+// The Pipe dtor closes the fd, so dup it.
+ForKitWritePipe = dup(inPipe.writeHandle());
 
 return child.id();
 }
@@ -1906,23 +1912,6 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 if (ClientPortNumber == MasterPortNumber)
 throw IncompatibleOptionsException("port");
 
-// Create the directory where the fifo pipe with ForKit will be.
-const Path pipePath = Path::forDirectory(ChildRoot + "/" + FIFO_PATH);
-if (!File(pipePath).exists() && !File(pipePath).createDirectory())
-{
-Log::error("Failed to create pipe 

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

[Henry Castro]

 loleaflet/dist/toolbar/toolbar.js |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit fbfd500a2ec2d3425903c002c63f1a73f20d152a
Author: Henry Castro 
Date:   Wed Oct 12 21:51:48 2016 -0400

loleaflet: fix style names in Layout dropdown

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 11281f5..4f2b649 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -839,11 +839,9 @@ map.on('commandstatechanged', function (e) {
return;
}
 
-   // For impress documents, template name is prefixed with style 
name.
-   // Strip the template name until we support it
+   // For impress documents, no styles is supported.
if (map.getDocType() === 'presentation') {
-   state = state.split('~LT~')[1];
-   state = L.Styles.impressMapping[state];
+   return;
}
 
$('.styles-select option').each(function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 dev/null  |binary
 sw/qa/extras/ww8export/data/all_gaps_word.doc |binary
 sw/qa/extras/ww8export/data/bnc787942.doc |binary
 sw/qa/extras/ww8export/data/bnc821208.doc |binary
 sw/qa/extras/ww8export/data/bordercolours.doc |binary
 sw/qa/extras/ww8export/data/cp139.doc |binary
 sw/qa/extras/ww8export/data/cp144.doc |binary
 sw/qa/extras/ww8export/data/fdo36868.doc  |binary
 sw/qa/extras/ww8export/data/fdo68963.doc  |binary
 sw/qa/extras/ww8export/data/fdo68967.doc  |binary
 sw/qa/extras/ww8export/data/fdo77844.doc  |binary
 sw/qa/extras/ww8export/data/fdo80333.doc  |binary
 sw/qa/extras/ww8export/data/fdo81102.doc  |binary
 sw/qa/extras/ww8export/data/i120158.doc   |binary
 sw/qa/extras/ww8export/data/list-nolevel.doc  |binary
 sw/qa/extras/ww8export/data/msobrightnesscontrast.doc |binary
 sw/qa/extras/ww8export/data/n652364.doc   |binary
 sw/qa/extras/ww8export/data/n750255.doc   |binary
 sw/qa/extras/ww8export/data/n757118.doc   |binary
 sw/qa/extras/ww8export/data/n757905.doc   |binary
 sw/qa/extras/ww8export/data/n757910.doc   |binary
 sw/qa/extras/ww8export/data/n760294.doc   |binary
 sw/qa/extras/ww8export/data/n816603.doc   |binary
 sw/qa/extras/ww8export/data/n823651.doc   |binary
 sw/qa/extras/ww8export/data/page-border.doc   |binary
 sw/qa/extras/ww8export/data/tdf102334.doc |binary
 sw/qa/extras/ww8export/data/tdf59896.doc  |binary
 sw/qa/extras/ww8export/data/tdf74328.doc  |binary
 sw/qa/extras/ww8export/data/tdf95321.doc  |binary
 sw/qa/extras/ww8export/data/tdf95576.doc  |binary
 sw/qa/extras/ww8export/data/tdf99100.doc  |binary
 sw/qa/extras/ww8export/ww8export.cxx  |  543 +
 sw/qa/extras/ww8import/ww8import.cxx  |  546 --
 33 files changed, 544 insertions(+), 545 deletions(-)

New commits:
commit a9afa89e953f0f32acf26b143717e7d067cbc75a
Author: Justin Luth 
Date:   Tue Oct 11 16:19:28 2016 +0300

move round-tripables to ww8export

This serves two purposes. It helps to prevent regressions
and it allows focus on features that still don't export properly.

Change-Id: I63ed43bccb2279f889474611ce436e85374e6bc5
Reviewed-on: https://gerrit.libreoffice.org/29704
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ww8import/data/all_gaps_word.doc 
b/sw/qa/extras/ww8export/data/all_gaps_word.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/all_gaps_word.doc
rename to sw/qa/extras/ww8export/data/all_gaps_word.doc
diff --git a/sw/qa/extras/ww8import/data/bnc787942.doc 
b/sw/qa/extras/ww8export/data/bnc787942.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/bnc787942.doc
rename to sw/qa/extras/ww8export/data/bnc787942.doc
diff --git a/sw/qa/extras/ww8import/data/bnc821208.doc 
b/sw/qa/extras/ww8export/data/bnc821208.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/bnc821208.doc
rename to sw/qa/extras/ww8export/data/bnc821208.doc
diff --git a/sw/qa/extras/ww8import/data/bordercolours.doc 
b/sw/qa/extras/ww8export/data/bordercolours.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/bordercolours.doc
rename to sw/qa/extras/ww8export/data/bordercolours.doc
diff --git a/sw/qa/extras/ww8import/data/cp139.doc 
b/sw/qa/extras/ww8export/data/cp139.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/cp139.doc
rename to sw/qa/extras/ww8export/data/cp139.doc
diff --git a/sw/qa/extras/ww8import/data/cp144.doc 
b/sw/qa/extras/ww8export/data/cp144.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/cp144.doc
rename to sw/qa/extras/ww8export/data/cp144.doc
diff --git a/sw/qa/extras/ww8import/data/fdo36868.doc 
b/sw/qa/extras/ww8export/data/fdo36868.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/fdo36868.doc
rename to sw/qa/extras/ww8export/data/fdo36868.doc
diff --git a/sw/qa/extras/ww8import/data/fdo68963.doc 
b/sw/qa/extras/ww8export/data/fdo68963.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/fdo68963.doc
rename to sw/qa/extras/ww8export/data/fdo68963.doc
diff --git a/sw/qa/extras/ww8import/data/fdo68967.doc 
b/sw/qa/extras/ww8export/data/fdo68967.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/fdo68967.doc
rename to sw/qa/extras/ww8export/data/fdo68967.doc
diff --git a/sw/qa/extras/ww8import/data/fdo77844.doc 
b/sw/qa/extras/ww8export/data/fdo77844.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/fdo77844.doc
rename to sw/qa/extras/ww8export/data/fdo77844.doc

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

[Kohei Yoshida]

 sc/source/core/tool/compiler.cxx |   20 ++--
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit a4d124e13abb7445f5b7f5f73556bc91ae867ab8
Author: Kohei Yoshida 
Date:   Sat Oct 1 21:07:20 2016 -0400

tdf#93894: Get column labels to work with formula groups.

Change-Id: Ia2a09981dceae2e9809c76570300de8ca1927c1b
Reviewed-on: https://gerrit.libreoffice.org/29514
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 
Reviewed-on: https://gerrit.libreoffice.org/29717
Reviewed-by: Michael Meeks 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 679e7f2..e5659d5 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5273,10 +5273,8 @@ bool ScCompiler::HandleColRowName()
 {
 ScSingleRefData aRefData;
 aRefData.InitAddress( aRange.aStart );
-if ( bColName )
-aRefData.SetColRel( true );
-else
-aRefData.SetRowRel( true );
+aRefData.SetColRel( true );
+aRefData.SetRowRel( true );
 aRefData.SetAddress(aRange.aStart, aPos);
 pNew->AddSingleReference( aRefData );
 }
@@ -5284,16 +5282,10 @@ bool ScCompiler::HandleColRowName()
 {
 ScComplexRefData aRefData;
 aRefData.InitRange( aRange );
-if ( bColName )
-{
-aRefData.Ref1.SetColRel( true );
-aRefData.Ref2.SetColRel( true );
-}
-else
-{
-aRefData.Ref1.SetRowRel( true );
-aRefData.Ref2.SetRowRel( true );
-}
+aRefData.Ref1.SetColRel( true );
+aRefData.Ref2.SetColRel( true );
+aRefData.Ref1.SetRowRel( true );
+aRefData.Ref2.SetRowRel( true );
 aRefData.SetRange(aRange, aPos);
 if ( bInList )
 pNew->AddDoubleReference( aRefData );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/docshell/externalrefmgr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8a0ec842b92857b6950c95e2c00ffa6b0ec12082
Author: Eike Rathke 
Date:   Tue Oct 11 15:10:46 2016 +0200

Resolves: tdf#101691 re-intern strings of external formula results

If the external cell referenced is a formula result of type string that
string needs to be re-interned for the reference cache as well.

Change-Id: Iea3c3d777dede2ad6ba0b084533af964da991ca6
(cherry picked from commit 351164ea2c70923e47d5f01f3934c73cfc5839a9)
Reviewed-on: https://gerrit.libreoffice.org/29694
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 4ac4112..dac47e5 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1558,8 +1558,8 @@ static FormulaToken* convertToToken( ScDocument* 
pHostDoc, ScDocument* pSrcDoc,
 }
 else
 {
-svl::SharedString aStr = pFCell->GetString();
-return new formula::FormulaStringToken(aStr);
+svl::SharedString aSS = 
pHostDoc->GetSharedStringPool().intern( pFCell->GetString().getString());
+return new formula::FormulaStringToken(aSS);
 }
 }
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/docshell/externalrefmgr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dfcf0bbcc51f50dfa93ac74623a069c3b527527a
Author: Eike Rathke 
Date:   Tue Oct 11 15:10:46 2016 +0200

Resolves: tdf#101691 re-intern strings of external formula results

If the external cell referenced is a formula result of type string that
string needs to be re-interned for the reference cache as well.

Change-Id: Iea3c3d777dede2ad6ba0b084533af964da991ca6
(cherry picked from commit 351164ea2c70923e47d5f01f3934c73cfc5839a9)
Reviewed-on: https://gerrit.libreoffice.org/29695
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 4b3c521..bb174ad 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1571,8 +1571,8 @@ static FormulaToken* convertToToken( ScDocument* 
pHostDoc, ScDocument* pSrcDoc,
 }
 else
 {
-svl::SharedString aStr = pFCell->GetString();
-return new formula::FormulaStringToken(aStr);
+svl::SharedString aSS = 
pHostDoc->GetSharedStringPool().intern( pFCell->GetString().getString());
+return new formula::FormulaStringToken(aSS);
 }
 }
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit e85bb2479f0566fd3a4f8e76fddbe3133f51965c
Author: Eike Rathke 
Date:   Wed Oct 12 19:47:44 2016 +0200

create NoName error token instead of setting error at the token array

... when handling name token. This can happen when importing BIFF .xls and 
the
original range is not present in the document. The document is broken, but 
such
formula can continue to work if the range expression was not actually 
executed,
for example IF(TRUE(),then_good,else_bad_range) where else_bad_range is 
#NAME?
error.

(cherry picked from commit d3645961d98ce9f0cfb1ef7f0aba7bf020b90945)

Change-Id: I823ac89115418cf5069b2baf5c5de2c814319ae7
Reviewed-on: https://gerrit.libreoffice.org/29736
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 5f827b9..679e7f2 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4573,6 +4573,7 @@ ScRangeData* ScCompiler::GetRangeData( const 
FormulaToken& rToken ) const
 
 bool ScCompiler::HandleRange()
 {
+ScTokenArray* pNew;
 const ScRangeData* pRangeData = GetRangeData( *mpToken);
 if (pRangeData)
 {
@@ -4581,7 +4582,6 @@ bool ScCompiler::HandleRange()
 SetError( errNoName );
 else if (mbJumpCommandReorder)
 {
-ScTokenArray* pNew;
 // put named formula into parentheses.
 // But only if there aren't any yet, parenthetical
 // ocSep doesn't work, e.g. SUM((...;...))
@@ -4630,7 +4630,15 @@ bool ScCompiler::HandleRange()
 }
 }
 else
-SetError(errNoName);
+{
+// No ScRangeData for an already compiled token can happen in BIFF .xls
+// import if the original range is not present in the document.
+pNew = new ScTokenArray;
+pNew->Add( new FormulaErrorToken( errNoName));
+PushTokenArray( pNew, true );
+pNew->Reset();
+return GetToken();
+}
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

[Stephan Bergmann]

 sal/osl/w32/socket.cxx |  255 ++---
 sal/osl/w32/sockimpl.h |   31 -
 2 files changed, 55 insertions(+), 231 deletions(-)

New commits:
commit 14a7ac2033273fdddfb9748d5fa1e1c0f25b64ca
Author: Stephan Bergmann 
Date:   Wed Oct 12 23:20:35 2016 +0200

SOCKET_USE_AUTODIAL is dead code

...ever since 010f71130b0d55079d01fbda38d45901de98b133 "INTEGRATION: CWS 
sal01:
#105958# Remove usage of wininet.dll autodial functions" wrapped its central
code in

  #ifdef SOCKET_USE_AUTODIAL

instead of removing it properly.

Change-Id: I4c077c71ce8eda3a3f8b83286178d0d7907a6e02
Reviewed-on: https://gerrit.libreoffice.org/29742
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index c927f42..1b2bc6d 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -262,142 +262,14 @@ static oslSocketError osl_SocketErrorFromNative(int 
nativeType)
 #define ERROR_FROM_NATIVE(y)osl_SocketErrorFromNative(y)
 
 /*/
-/* oslSocketDialupImpl */
-/*/
-static oslSocketDialupImpl *pDialupImpl = nullptr;
-
-static oslSocketDialupImpl* osl_createSocketDialupImpl()
-{
-oslSocketDialupImpl *pImpl;
-pImpl = static_cast(rtl_allocateZeroMemory( sizeof 
(oslSocketDialupImpl)));
-
-InitializeCriticalSection (>m_hMutex);
-
-return (pImpl);
-}
-
-static void osl_initSocketDialupImpl (oslSocketDialupImpl *pImpl)
-{
-#ifdef SOCKET_USE_AUTODIAL
-if (pImpl)
-{
-HINSTANCE hModule;
-
-EnterCriticalSection (>m_hMutex);
-
-hModule = LoadLibrary (INTERNET_MODULE_NAME);
-if (!(hModule <= (HINSTANCE)HINSTANCE_ERROR))
-{
-pImpl->m_pfnAttemptConnect = (INTERNETATTEMPTCONNECT)
-(GetProcAddress (hModule, "InternetAttemptConnect"));
-pImpl->m_pfnAutodial = (INTERNETAUTODIAL)
-(GetProcAddress (hModule, "InternetAutodial"));
-pImpl->m_pfnAutodialHangup = (INTERNETAUTODIALHANGUP)
-(GetProcAddress (hModule, "InternetAutodialHangup"));
-pImpl->m_pfnGetConnectedState = (INTERNETGETCONNECTEDSTATE)
-(GetProcAddress (hModule, "InternetGetConnectedState"));
-pImpl->m_hModule = hModule;
-}
-
-LeaveCriticalSection (>m_hMutex);
-}
-#else
-(void)pImpl;
-#endif
-}
-
-static void osl_destroySocketDialupImpl (oslSocketDialupImpl *pImpl)
-{
-if (pImpl)
-{
-EnterCriticalSection (>m_hMutex);
-
-if (pImpl->m_dwFlags & INTERNET_CONNECTION_HANGUP)
-{
-if (pImpl->m_pfnAutodialHangup)
-{
-(pImpl->m_pfnAutodialHangup)(0);
-pImpl->m_dwFlags &= ~INTERNET_CONNECTION_HANGUP;
-}
-}
-
-if (pImpl->m_hModule)
-FreeLibrary (pImpl->m_hModule);
-
-LeaveCriticalSection (>m_hMutex);
-DeleteCriticalSection (>m_hMutex);
-
-rtl_freeMemory (pImpl);
-}
-}
-
-static bool osl_querySocketDialupImpl()
-{
-bool result;
-
-if (pDialupImpl == nullptr)
-{
-pDialupImpl = osl_createSocketDialupImpl();
-osl_initSocketDialupImpl (pDialupImpl);
-}
-
-EnterCriticalSection (>m_hMutex);
-
-result = true;
-if (pDialupImpl->m_pfnGetConnectedState)
-{
-DWORD dwFlags = 0;
-
-result = (pDialupImpl->m_pfnGetConnectedState)(, 0);
-pDialupImpl->m_dwFlags |= dwFlags;
-}
-
-LeaveCriticalSection (>m_hMutex);
-return result;
-}
-
-static bool osl_attemptSocketDialupImpl()
-{
-bool result;
-
-if (pDialupImpl == nullptr)
-{
-pDialupImpl = osl_createSocketDialupImpl();
-osl_initSocketDialupImpl (pDialupImpl);
-}
-
-EnterCriticalSection (>m_hMutex);
-
-result = osl_querySocketDialupImpl();
-if (!result)
-{
-result = true;
-if (pDialupImpl->m_pfnAutodial)
-{
-result = (pDialupImpl->m_pfnAutodial)(0, 0);
-if (result)
-pDialupImpl->m_dwFlags |= INTERNET_CONNECTION_HANGUP;
-else
-WSASetLastError (WSAENETDOWN);
-}
-}
-
-LeaveCriticalSection (>m_hMutex);
-return result;
-}
-
-/*/
 /* oslSocketImpl */
 /*/
-static sal_uInt32 g_nSocketImpl = 0;
-
 #if OSL_DEBUG_LEVEL > 0
 static sal_uInt32 g_nSocketAddr = 0;
 struct LeakWarning
 {
 ~LeakWarning()
 {
-SAL_WARN_IF( g_nSocketImpl, "sal.osl", "sal_socket: " << g_nSocketImpl 
<< " socket instances leak" );
 SAL_WARN_IF( 

Re: [Libreoffice-qa] Need help in understanding results of bibisect

[Xisco Fauli]

Hi Alex,

El 12/10/16 a les 19:46, Alex McMurchy ha escrit:

All

As a training exercise I ran through a bibisect session to try and 
track done the cause of the regression bug -

[Bug 102951] Mail Merge Wizard no longer works
This was a bug that I'd raised myself, several days ago, so had some 
interest in it.


Great! Thank you for reporting the bug and helping bibisecting it.


From the bibisect I got this result -


f0be6ccdc4e4e45f3d6bcf322f98dbd66b1dcfc0 is the first bad commit
commit f0be6ccdc4e4e45f3d6bcf322f98dbd66b1dcfc0
Author: Miklos Vajna 
Date:   Sat Mar 19 05:41:35 2016 +0100

2016-03-19: source-hash-b86b97e54590872fc0ea85fbea22c2d00d241181

:100644 100644 2af32b9130734292d26f33b9ac77ed8474f735a3 
eb4c7262bb954e1897378ee6f73548f9dfefc234 M  build-info.txt
:04 04 bb948b1da2441f0590c9b6b90cb963ebc8f3d05c 
0b17c036fcfc6e30417d0e4b52176c87fd401f1d M  opt



I then did this


 git show f0be6cc --stat


I've extracted what I believe to be relevant information, for the bug 
report I'd raised, returned by the above command which I've recorded below
 opt/share/config/soffice.cfg/modules/swform/toolbar/mailmerge.xml |  
25 +
 opt/share/config/soffice.cfg/modules/swreport/toolbar/mailmerge.xml 
|  25 +
 opt/share/config/soffice.cfg/modules/swriter/toolbar/mailmerge.xml 
|  25 +
 opt/share/config/soffice.cfg/modules/swriter/ui/floatingmmchild.ui 
|  54 ---
 opt/share/config/soffice.cfg/modules/swriter/ui/mmmergepage.ui | 263 
--
 opt/share/config/soffice.cfg/modules/swriter/ui/mmoutputpage.ui | 
674 

 opt/share/config/soffice.cfg/modules/swriter/ui/mmpreparepage.ui | 
350 --
 opt/share/config/soffice.cfg/modules/swriter/ui/mmresultemaildialog.ui 
| 430 
++
 opt/share/config/soffice.cfg/modules/swriter/ui/mmresultprintdialog.ui 
| 292 
 opt/share/config/soffice.cfg/modules/swriter/ui/mmresultsavedialog.ui 
| 222 ++
 opt/share/config/soffice.cfg/modules/swxform/toolbar/mailmerge.xml 
|  25 +


and

 160 files changed, 1126 insertions(+), 1415 deletions(-)


It then dawned on me, rightly or wrongly, that /*git show f0be6cc 
--stat*/ was showing me all the commits that had been applied on one 
particular day.


Again, rightly or wrongly, what I think I did was to go back to the 
source code and did bisects -


 1. between the commits one or two days around about Sat Mar 19
05:41:35 2016 the date of the first bad commit in bibisect. Found
nothing.
 2. over a wider range that gave me these positive results -



  ba0796b 2015-12-23 | mailmerge: Killed the 'Save, print or send' page. (HEAD) 
[Jan Holesovsky]
* 6b35590 2015-12-23 | mailmerge: Implemented "Edit Individual Documents" 
toolbar button. (refs/bisect/good-6b355901a7e7a1fd8710e743621ad655068a5817) [Jan 
Holesovsky]
* 6d08322 2015-12-23 | mailmerge: Icon for the Mail Merge Wizard too. [Jan 
Holesovsky]
* 7342baf 2015-12-23 | mailmerge: Really show the icons for 
first/prev/next/last mailmerge entry. [Jan Holesovsky]
* d0f7cdc 2015-12-22 | mailmerge: Icons for the first/prev/next/last mailmerge 
entry buttons. (refs/bisect/good-d0f7cdc36d9858c3eed461377564a1875305d6e0) [Jan 
Holesovsky]
* 00fa85e 2015-12-22 | mailmerge: Make the SwMailMergeConfigItem instance 
long-living. [Jan Holesovsky]
* 906333a 2015-12-22 | mailmerge: Decrease indentation level by an early 
return. [Jan Holesovsky]
* 55202ec 2015-12-21 | mailmerge: Enable/disable the first/prev/next/last 
mailmerge entry buttons. [Jan Holesovsky]
* 827ff2e 2015-12-18 | mailmerge: Introduce buttons for first/prev/next/last 
mailmerge entry. [Jan Holesovsky]
* 299cc33 2015-12-18 | mailmerge: Don't hide the source document. [Jan 
Holesovsky]
* ac522d1 2015-12-18 | mailmerge: Introduce a mailmerge toolbar. [Jan 
Holesovsky]


The question I've got is how one gets from the bibisect commit to the 
actual commit in the master tree?


Mainly there are three kind of bibisect repositories:
1. 'max' repos: They have one build per commit
2. 'all' repos: They have one build made every 64 commits
3. dbgutil daily repos: They have one build made daily

So, as you're using the last one, in the end you will have a range of 
commits made between 2016-03-18 and 2016-03-19 where the problematic one 
should be.
At this point, you can run 'git bisect log', copy the output to the bug 
and add the keywords: 'regression' and 'bibisected'. More info: 
https://wiki.documentfoundation.org/QA/Bibisect/Linux#Short_.28and_sweet.29_Instructions_-_Linux_Only


However, I'd recommend you to use the max repos when possible as the 
problematic 

[Libreoffice-bugs] [Bug 103165] [FILEOPEN] DOX import - 2nd table is positioned incorrectly

[bugzilla-daemon]

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

--- Comment #3 from maarten  ---
Thanks for having looked at this.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103159] unable to compile in 12.04: Namespace prefix manifest on file-entry is not defined"

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:5.3.0

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103159] unable to compile in 12.04: Namespace prefix manifest on file-entry is not defined"

[bugzilla-daemon]

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

--- Comment #4 from Commit Notification 
 ---
Justin Luth committed a patch related to this issue.
It has been pushed to "master":

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

tdf#103159 allow compiling on 12.04 systems still

It will be available in 5.3.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 the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103092] FILESAVE: Calc: wrong position for rotated pictures to 270 degree after save

[bugzilla-daemon]

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

m.a.riosv  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-ux-advise] [Bug 103167] New: Disable sidebar decks in Notebookbar mode

[bugzilla-daemon]

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

Bug ID: 103167
   Summary: Disable sidebar decks in Notebookbar mode
   Product: LibreOffice
   Version: 5.3.0.0.alpha0+ Master
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: enhancement
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-b...@lists.freedesktop.org
  Reporter: philip...@hotmail.com
CC: libreoffice-ux-advise@lists.freedesktop.org
Blocks: 65138, 102062

When notebookbar mode is enabled, a number of implementations would like to
disable decks of the sidebar, like for example the properties deck. So we would
need to implement this feature and have it configurable in XML.

officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=65138
[Bug 65138] [META] Sidebar feature related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=102062
[Bug 102062] [META] Extended Toolbar (Notebookbar) bugs and enhancements
-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Libreoffice-ux-advise mailing list
Libreoffice-ux-advise@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise

[Libreoffice-bugs] [Bug 103167] New: Disable sidebar decks in Notebookbar mode

[bugzilla-daemon]

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

Bug ID: 103167
   Summary: Disable sidebar decks in Notebookbar mode
   Product: LibreOffice
   Version: 5.3.0.0.alpha0+ Master
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: enhancement
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: philip...@hotmail.com
CC: libreoffice-ux-adv...@lists.freedesktop.org
Blocks: 65138, 102062

When notebookbar mode is enabled, a number of implementations would like to
disable decks of the sidebar, like for example the properties deck. So we would
need to implement this feature and have it configurable in XML.

officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=65138
[Bug 65138] [META] Sidebar feature related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=102062
[Bug 102062] [META] Extended Toolbar (Notebookbar) bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 65138] [META] Sidebar feature related issues

[bugzilla-daemon]

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

Yousuf Philips (jay)  changed:

   What|Removed |Added

 Depends on||103167


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=103167
[Bug 103167] Disable sidebar decks in Notebookbar mode
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103167] Disable sidebar decks in Notebookbar mode

[bugzilla-daemon]

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

Yousuf Philips (jay)  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 CC|libreoffice-ux-advise@lists |
   |.freedesktop.org|
 Ever confirmed|0   |1

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 102062] [META] Extended Toolbar (Notebookbar) bugs and enhancements

[bugzilla-daemon]

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

Yousuf Philips (jay)  changed:

   What|Removed |Added

 Depends on||103167


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=103167
[Bug 103167] Disable sidebar decks in Notebookbar mode
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-ux-advise] [Bug 103167] Disable sidebar decks in Notebookbar mode

[bugzilla-daemon]

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

Yousuf Philips (jay)  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 CC|libreoffice-ux-advise@lists |
   |.freedesktop.org|
 Ever confirmed|0   |1

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

[Libreoffice-bugs] [Bug 101249] Easily activate single toolbar, sidebar mode, and extended toolbar

[bugzilla-daemon]

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

Yousuf Philips (jay)  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=10
   ||3167

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 100242] 3D transitions do not work despite having OpenGL 3.0 support

[bugzilla-daemon]

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

--- Comment #5 from Bastián Díaz  ---
(In reply to Buovjaga from comment #4)
> Bastián: did you test with
> SAL_USE_VCLPLUGIN=gtk libreoffice
> 
> versus
> 
> SAL_USE_VCLPLUGIN=gtk3 libreoffice
> 
> Is there a difference?


I've used that option before and with poor results. Using
`SAL_USE_VCLPLUGIN=gtk libreoffice` and I get 3D transitions but with a very
poor display. My current solution is to install the RPM of the official
website.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103166] CONTEXT MENU: Visual artifact when displaying empty submenus

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 CC||ba...@quipo.it

--- Comment #1 from tommy27  ---
would you please post a screenshot regarding that "tiny line" ?

I don't reproduce you bug under Win8.1 x64 using LibO 5.2.1.2 and 5.3.0.0+
alpha

I correctly see the  submenu

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 100242] 3D transitions do not work despite having OpenGL 3.0 support

[bugzilla-daemon]

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

--- Comment #6 from Bastián Díaz  ---
Created attachment 127979
  --> https://bugs.documentfoundation.org/attachment.cgi?id=127979=edit
gtk native app (bad display)

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 100242] 3D transitions do not work despite having OpenGL 3.0 support

[bugzilla-daemon]

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

--- Comment #7 from Bastián Díaz  ---
Created attachment 127980
  --> https://bugs.documentfoundation.org/attachment.cgi?id=127980=edit
gtk libreoffice from web (good display)

both tested in fedora 24 workstation (64 bit)

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 43808] [META] Right to left language issues (RTL/CTL)

[bugzilla-daemon]

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

Bug 103103 Summary: Many Arabic fonts dont render correctly on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=103103

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 71732] [META] Bugs related to text rendering, typography and font features in LO

[bugzilla-daemon]

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

Khaled Hosny  changed:

   What|Removed |Added

 Depends on||103103


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=103103
[Bug 103103] Many Arabic fonts dont render correctly on Linux
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 71732] [META] Bugs related to text rendering, typography and font features in LO

[bugzilla-daemon]

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

Bug 103103 Summary: Many Arabic fonts dont render correctly on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=103103

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103169] Using IF only shows TRUE or FALSE

[bugzilla-daemon]

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

--- Comment #1 from Roger  ---
Created attachment 127981
  --> https://bugs.documentfoundation.org/attachment.cgi?id=127981=edit
Latest Linux update

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 98259] [META] Keyboard shortcuts and accelerators bugs and enhancements

[bugzilla-daemon]

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

--- Comment #11 from HansPL  ---
(In reply to Yousuf Philips (jay) from comment #10)
> […] As stated above we do try as much as possible not to change accelerators 
> > as much as possible. 

Sorry, but I do not find this to be true. At least not in my German LO, so this
is probably more of an l10n issue.  

Take for instance the context menu (menu key or right mouse button) in Writer,
which triggered my above rant:  From 5.1.4.2 to 5.2.2.2  seven out of ten
accelerators were changed where there was absolutely no need:  
• Einfügen  from i to n 
• Inhalte einfügen  from I to h 
• Zeichen…  from c to Z 
• Absatz…  from b to t
• Aufzählungszeichen  from u to ä 
• Absatzvorlage  from nothing to e 
• Synonyme  from m to S  
And where could I customize this context menu?  Which is not an option anyway
because I use LO in different versions on five different Linux machines (Mint
LMDE Mate) plus sometimes on colleague's Windows machines…  

(By the way, in 5.2.2.2 the opened context menu blocks Alt+Print so I cannot
take a screenshot of that menu — in 4.3.3.2 and 5.1.4.2 it works.) 

This is just the one of several examples which enraged me this morning.  

Or, for instance the same context menu in Writer inside a table to edit the
table's properties:  
• In Writer 4.3.3.2 I typed  Menu Alt+E  for Tabelle… 
• In Writer 5.1.4.2 Einfügen was changed from i to e so it now collided with
renamed Tabelleneigenschaften, opening a submenu, forcing me to  Menu Alt+E
Left Alt+E. 
• In Writer 5.2.2.2 Tabelleneigenschaften was changed from e to i so the
collision is now removed and the two accelerators are exactly the opposite from
 those of 4.3.3.2.  
Please note that now in 5.2.2.2 in the context menu Einfügen has e when the
cursor is in a table, but n when outside a table (see above).  What the **?! 

Or, for instance, take Calc's Search menu where I often need to
activate »In allen Tabellen suchen« (Search in all tables): 
• In Calc 4.3.3.2 I typed  Ctrl-H Alt+O Alt+C  
• In Calc 5.1.4.2 the menu is basically the same but just that last accelerator
c got lost so it was now Ctrl+H Alt+O Tab Tab Tab Tab Tab Space.
• In Calc 5.2.2.2 the menu was redesigned, this checkbox moved up from Options
but no underlined characters at all anymore!  They only appear when pressing
Alt which I take to be another new bug, certainly no feature.  My checkbox is
renamed to »Alle Tabellen» and still has no accelerator, so it is now Ctrl+H
Tab Tab Tab Tab Space.  What will it be next week?  

Can you feel my pain?  Do you really expect users to comb through all menus
every few weeks and write a dozen bug reports about moved accelerators?  Just
compiling these examples took a good hour.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 97675] Add option to put endnotes to the end of the document ( in stead of on separate page)

[bugzilla-daemon]

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

--- Comment #3 from Heiko Tietze  ---
(In reply to Oliver Specht (CIB) from comment #2)
> ->Heiko: You didn't want to ask in _this_ issue, did you?

Where else? You mean better refer to bug 102835...

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103168] New: file properties warning when copying

[bugzilla-daemon]

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

Bug ID: 103168
   Summary: file properties warning when copying
   Product: LibreOffice
   Version: 5.2.1.2 release
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: c...@nightstringers.com

Description:
So I have a folder named  billing with invoices inside that folder when I copy
the folder and paste it to a thumb drive it gives me a warning and asks Do you
want to copy said file without its properties it asks me for 2 out of 100s .It
was asking me only about one then when I recopied the billing folder a second
time it asked the properties question for 2 of the files inside the billing
folder. this is a new bug I haven't seen before.  Great program btw  I will
continue to use it and support it.

Steps to Reproduce:
1.folder with all my billing invoices paid and unpaid  copy
2.paste to a thumb drive as its pasting the warning comes up
3.

Actual Results:  
I choice yes and the properties seem to still be in the pasted version

Expected Results:
properties to not be there


Reproducible: Always

User Profile Reset: No

Additional Info:
[Information automatically included from LibreOffice]
Locale: en-US
Module: StartModule
[Information guessed from browser]
OS: Windows (All)
OS is 64bit: yes
Builds ID: LibreOffice 5.1.5.2


User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML,
like Gecko) Chrome/53.0.2785.143 Safari/537.36

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103166] CONTEXT MENU: Visual artifact when displaying empty submenus

[bugzilla-daemon]

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

Maxim Monastirsky  changed:

   What|Removed |Added

 CC||momonas...@gmail.com

--- Comment #2 from Maxim Monastirsky  ---
It's the "gtk3: implement native context menus" commit. The  item isn't supported there, and also not under macOS. But is should
still work where we still use non-native menus (i.e. gen, gtk2, Windows).

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs