[Libreoffice-commits] core.git: include/oox oox/source package/inc package/source
include/oox/crypto/AgileEngine.hxx |2 +-
include/oox/ole/axbinarywriter.hxx |4 ++--
oox/source/crypto/AgileEngine.cxx |4 +---
oox/source/ole/axbinarywriter.cxx |7 +++
package/inc/ZipFile.hxx|2 +-
package/source/zipapi/ZipFile.cxx |4 +---
6 files changed, 9 insertions(+), 14 deletions(-)
New commits:
commit 67649406d7b72f8d6ea4bbe76e775e0052ddefc3
Author: Noel Grandin
AuthorDate: Sat Aug 11 13:55:03 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Aug 13 08:35:16 2018 +0200
loplugin:returnconstant in oox,package
Change-Id: I1dade7ddde6b1e226861d32f24f65be5bb9d9352
Reviewed-on: https://gerrit.libreoffice.org/58880
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/oox/crypto/AgileEngine.hxx
b/include/oox/crypto/AgileEngine.hxx
index 02f139bcfc11..40f9d7f6e3eb 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -108,7 +108,7 @@ public:
// Decryption
-bool decryptEncryptionKey(OUString const & rPassword);
+void decryptEncryptionKey(OUString const & rPassword);
bool decryptAndCheckVerifierHash(OUString const & rPassword);
bool generateEncryptionKey(OUString const & rPassword) override;
diff --git a/include/oox/ole/axbinarywriter.hxx
b/include/oox/ole/axbinarywriter.hxx
index c8b1bdb29158..000ca96e550e 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -86,7 +86,7 @@ public:
respective flag in the property mask is set. */
template< typename StreamType, typename DataType >
voidwriteIntProperty( DataType ornValue )
-{ if( startNextProperty() )
maOutStrm.writeAligned< StreamType >( ornValue ); }
+{ startNextProperty(); maOutStrm.writeAligned<
StreamType >( ornValue ); }
/** Write a boolean property value to the stream, the
respective flag in the property mask is set. */
voidwriteBoolProperty( bool orbValue );
@@ -106,7 +106,7 @@ public:
private:
boolensureValid();
-boolstartNextProperty( bool bSkip = false );
+voidstartNextProperty( bool bSkip = false );
private:
/** Base class for complex properties such as string, point, size, GUID,
picture. */
diff --git a/oox/source/crypto/AgileEngine.cxx
b/oox/source/crypto/AgileEngine.cxx
index 80c233d95655..54a8d952c66d 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -331,7 +331,7 @@ bool AgileEngine::decryptAndCheckVerifierHash(OUString
const & rPassword)
return (hash.size() <= hashValue.size() && std::equal(hash.begin(),
hash.end(), hashValue.begin()));
}
-bool AgileEngine::decryptEncryptionKey(OUString const & rPassword)
+void AgileEngine::decryptEncryptionKey(OUString const & rPassword)
{
sal_Int32 nKeySize = mInfo.keyBits / 8;
@@ -342,8 +342,6 @@ bool AgileEngine::decryptEncryptionKey(OUString const &
rPassword)
calculateHashFinal(rPassword, aPasswordHash);
calculateBlock(constBlock3, aPasswordHash, mInfo.encryptedKeyValue, mKey);
-
-return true;
}
// TODO: Rename
diff --git a/oox/source/ole/axbinarywriter.cxx
b/oox/source/ole/axbinarywriter.cxx
index b532527923ab..d0e0c556e975 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -138,8 +138,8 @@ void AxBinaryPropertyWriter::writeBoolProperty( bool
orbValue )
void AxBinaryPropertyWriter::writePairProperty( AxPairData& orPairData )
{
-if( startNextProperty() )
-maLargeProps.push_back( ComplexPropVector::value_type( new
PairProperty( orPairData ) ) );
+startNextProperty();
+maLargeProps.push_back( ComplexPropVector::value_type( new PairProperty(
orPairData ) ) );
}
void AxBinaryPropertyWriter::writeStringProperty( OUString& orValue )
@@ -198,12 +198,11 @@ bool AxBinaryPropertyWriter::ensureValid()
return mbValid;
}
-bool AxBinaryPropertyWriter::startNextProperty( bool bSkip )
+void AxBinaryPropertyWriter::startNextProperty( bool bSkip )
{
// if we are skipping then we clear the flag
setFlag( mnPropFlags, mnNextProp, !bSkip );
mnNextProp <<= 1;
-return true;
}
} // namespace exp
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index c5353b6c17d2..3dceb036c3bd 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -82,7 +82,7 @@ class ZipFile
void getSizeAndCRC( sal_Int64 nOffset, sal_Int64 nCompressedSize,
sal_Int64 *nSize, sal_Int32 *nCRC );
-bool readLOC( ZipEntry &rEntry );
+void readLOC( ZipEntry &rEntry );
sal_Int32 readCEN();
sal_Int32 findEND();
void recover();
diff --git a/package/source/zipapi/ZipFile.cxx
b/package/source/zipapi/ZipFile.cxx
index d2fa8a456392..27a89f27a1ba 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -75
[Libreoffice-commits] core.git: hwpfilter/source include/test test/source
hwpfilter/source/hwpfile.cxx|4 +---
hwpfilter/source/hwpfile.h |2 +-
include/test/sheet/xdatapilottable2.hxx |2 +-
test/source/sheet/xdatapilottable2.cxx |3 +--
4 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit e7cc6b253f5a1fd1205da231f6a14011501ed74e
Author: Noel Grandin
AuthorDate: Sat Aug 11 13:55:37 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Aug 13 08:34:55 2018 +0200
loplugin:returnconstant in hwpfilter,test
Change-Id: I7c7c450f1da4ac3205148d2de8b344f0735f92ba
Reviewed-on: https://gerrit.libreoffice.org/58881
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 552233dd853d..d3bd660e77fd 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -253,7 +253,7 @@ void HWPFile::ReadParaList(std::vector < HWPPara* > &aplist)
}
}
-bool HWPFile::ReadParaList(std::vector< std::unique_ptr > &aplist,
unsigned char flag)
+void HWPFile::ReadParaList(std::vector< std::unique_ptr > &aplist,
unsigned char flag)
{
std::unique_ptr spNode( new HWPPara );
unsigned char tmp_etcflag;
@@ -284,8 +284,6 @@ bool HWPFile::ReadParaList(std::vector<
std::unique_ptr > &aplist, unsi
aplist.push_back(std::move(spNode));
spNode.reset( new HWPPara );
}
-
-return true;
}
void HWPFile::TagsRead()
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 1c9e7a09a234..4f68543f5b13 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -156,7 +156,7 @@ class DLLEXPORT HWPFile
/**
* Reads main paragraph list
*/
-bool ReadParaList(std::vector> &aplist,
unsigned char flag = 0);
+void ReadParaList(std::vector> &aplist,
unsigned char flag = 0);
void ReadParaList(std::vector &aplist);
/**
* Sets if the stream is compressed
diff --git a/include/test/sheet/xdatapilottable2.hxx
b/include/test/sheet/xdatapilottable2.hxx
index 8933379fb5c2..a7ffde07d964 100644
--- a/include/test/sheet/xdatapilottable2.hxx
+++ b/include/test/sheet/xdatapilottable2.hxx
@@ -38,7 +38,7 @@ public:
protected:
private:
-static bool checkDrillDownSheetContent(css::uno::Reference<
css::sheet::XSpreadsheet > const & xSheet, const css::uno::Sequence<
css::uno::Sequence < css::uno::Any > >& aData);
+static void checkDrillDownSheetContent(css::uno::Reference<
css::sheet::XSpreadsheet > const & xSheet, const css::uno::Sequence<
css::uno::Sequence < css::uno::Any > >& aData);
void getOutputRanges(css::uno::Reference< css::sheet::XDataPilotTable2 >
const &);
void buildDataFields(css::uno::Reference< css::sheet::XDataPilotTable2 >
const &);
diff --git a/test/source/sheet/xdatapilottable2.cxx
b/test/source/sheet/xdatapilottable2.cxx
index 5d49871bc620..d54a12f425bb 100644
--- a/test/source/sheet/xdatapilottable2.cxx
+++ b/test/source/sheet/xdatapilottable2.cxx
@@ -248,7 +248,7 @@ table::CellAddress getLastUsedCellAddress( uno::Reference<
sheet::XSpreadsheet >
}
-bool XDataPilotTable2::checkDrillDownSheetContent(uno::Reference<
sheet::XSpreadsheet > const & xSheet, const uno::Sequence< uno::Sequence< Any >
>& aData)
+void XDataPilotTable2::checkDrillDownSheetContent(uno::Reference<
sheet::XSpreadsheet > const & xSheet, const uno::Sequence< uno::Sequence< Any >
>& aData)
{
table::CellAddress aLastCell = getLastUsedCellAddress(xSheet, 0, 0);
CPPUNIT_ASSERT(aData.getLength() > 0);
@@ -271,7 +271,6 @@ bool
XDataPilotTable2::checkDrillDownSheetContent(uno::Reference< sheet::XSpread
CPPUNIT_ASSERT_EQUAL(aCell2, aCell1);
}
}
-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 - forms/source formula/source fpicker/source include/formula linguistic/source lotuswordpro/source
forms/source/component/DatabaseForm.cxx |4 -
forms/source/component/DatabaseForm.hxx |2
forms/source/component/ImageControl.cxx | 10 +---
forms/source/component/ImageControl.hxx |2
formula/source/core/api/FormulaCompiler.cxx |6 --
formula/source/ui/dlg/formula.cxx |5 --
fpicker/source/office/RemoteFilesDialog.cxx |6 --
fpicker/source/office/RemoteFilesDialog.hxx |2
include/formula/FormulaCompiler.hxx |2
linguistic/source/lngsvcmgr.cxx | 66
lotuswordpro/source/filter/bencont.cxx | 13 +
lotuswordpro/source/filter/bento.hxx|6 +-
lotuswordpro/source/filter/benval.cxx | 11 +---
lotuswordpro/source/filter/tocread.cxx | 18 ++-
14 files changed, 57 insertions(+), 96 deletions(-)
New commits:
commit eb841c06f879df11142c659b372e365c361a231b
Author: Noel Grandin
AuthorDate: Sat Aug 11 13:53:37 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Aug 13 08:34:28 2018 +0200
loplugin:returnconstant in linguistic,lotuswordpro
Change-Id: If5c7d936020e5470b09c2fe54d41fb006c296a34
Reviewed-on: https://gerrit.libreoffice.org/58877
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index e50d607caa4d..83668cc06dfa 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -208,14 +208,14 @@ public:
processDictionaryListEvent(
const linguistic2::DictionaryListEvent& rDicListEvent )
override;
-inline boolAddLngSvcMgrListener(
+inline voidAddLngSvcMgrListener(
const uno::Reference< lang::XEventListener >&
rxListener );
-inline boolRemoveLngSvcMgrListener(
+inline voidRemoveLngSvcMgrListener(
const uno::Reference< lang::XEventListener >&
rxListener );
voidDisposeAndClear( const lang::EventObject &rEvtObj );
-boolAddLngSvcEvtBroadcaster(
+voidAddLngSvcEvtBroadcaster(
const uno::Reference<
linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
-boolRemoveLngSvcEvtBroadcaster(
+voidRemoveLngSvcEvtBroadcaster(
const uno::Reference<
linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
voidAddLngSvcEvt( sal_Int16 nLngSvcEvt );
@@ -349,19 +349,17 @@ void LngSvcMgrListenerHelper::LaunchEvent( sal_Int16
nLngSvcEvtFlags )
}
-inline bool LngSvcMgrListenerHelper::AddLngSvcMgrListener(
+inline void LngSvcMgrListenerHelper::AddLngSvcMgrListener(
const uno::Reference< lang::XEventListener >& rxListener )
{
aLngSvcMgrListeners.addInterface( rxListener );
-return true;
}
-inline bool LngSvcMgrListenerHelper::RemoveLngSvcMgrListener(
+inline void LngSvcMgrListenerHelper::RemoveLngSvcMgrListener(
const uno::Reference< lang::XEventListener >& rxListener )
{
aLngSvcMgrListeners.removeInterface( rxListener );
-return true;
}
@@ -389,7 +387,7 @@ void LngSvcMgrListenerHelper::DisposeAndClear( const
lang::EventObject &rEvtObj
}
-bool LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
+void LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
const uno::Reference< linguistic2::XLinguServiceEventBroadcaster >
&rxBroadcaster )
{
if (rxBroadcaster.is())
@@ -398,11 +396,10 @@ bool LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
rxBroadcaster->addLinguServiceEventListener(
static_cast(this) );
}
-return false;
}
-bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
+void LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
const uno::Reference< linguistic2::XLinguServiceEventBroadcaster >
&rxBroadcaster )
{
if (rxBroadcaster.is())
@@ -411,7 +408,6 @@ bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
rxBroadcaster->removeLinguServiceEventListener(
static_cast(this) );
}
-return false;
}
@@ -1436,14 +1432,13 @@ sal_Bool SAL_CALL
{
osl::MutexGuard aGuard( GetLinguMutex() );
-bool bRes = false;
-if (!bDisposing && xListener.is())
-{
-if (!mxListenerHelper.is())
-GetListenerHelper_Impl();
-bRes = mxListenerHelper->AddLngSvcMgrListener( xListener );
-}
-return bRes;
+if (bDisposing || !xListener.is())
+return false;
+
+if (!mxListenerHelper.is())
+GetListenerHelper_Impl();
+mxListenerHelper->AddLngSvcMgrListener( xListener );
+return true;
}
@@ -1453,15 +1448,14 @@ sal_Bool SAL_CALL
{
osl::MutexGuard aGuard( GetLinguMutex() );
-bool bRes = false;
-if (!bDisposing && xListener.is())
-{
-DBG_ASSERT( mxListenerHelper.is(), "listener removed without being
added" );
-if (!mxListenerHelper.is())
-GetListenerHelper_
[Libreoffice-commits] core.git: 2 commits - sd/source unoxml/inc unoxml/source uui/source
sd/source/filter/eppt/eppt.cxx | 14 +++-
sd/source/filter/eppt/eppt.hxx |4 +--
sd/source/filter/eppt/epptooxml.hxx |2 -
sd/source/filter/eppt/pptx-epptooxml.cxx|6 +
sd/source/filter/html/htmlex.cxx|6 +
sd/source/filter/html/htmlex.hxx|2 -
sd/source/ui/func/fumorph.cxx | 18 +++-
sd/source/ui/inc/OutlineView.hxx|2 -
sd/source/ui/inc/SlideSorter.hxx|2 -
sd/source/ui/inc/fumorph.hxx|2 -
sd/source/ui/inc/slideshow.hxx |2 -
sd/source/ui/slideshow/slideshow.cxx| 11 -
sd/source/ui/slidesorter/shell/SlideSorter.cxx |4 ---
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |4 +--
sd/source/ui/view/DocumentRenderer.cxx |7 +-
sd/source/ui/view/drviews2.cxx |4 ---
sd/source/ui/view/outlnvsh.cxx |4 ++-
sd/source/ui/view/outlview.cxx |3 --
unoxml/inc/eventdispatcher.hxx |2 -
unoxml/source/events/eventdispatcher.cxx| 11 -
uui/source/iahndl-authentication.cxx|4 ---
uui/source/iahndl.hxx |2 -
22 files changed, 47 insertions(+), 69 deletions(-)
New commits:
commit 7a5d2b3cdb448998e6aef1f12f0a70c400a434d2
Author: Noel Grandin
AuthorDate: Sat Aug 11 13:54:31 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Aug 13 08:34:49 2018 +0200
loplugin:returnconstant in unoxml,uui
Change-Id: Iac240f59acf8404fe5439a7e450c048df0d7a54e
Reviewed-on: https://gerrit.libreoffice.org/58879
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/unoxml/inc/eventdispatcher.hxx b/unoxml/inc/eventdispatcher.hxx
index ee8bec567590..be6a7206e7cb 100644
--- a/unoxml/inc/eventdispatcher.hxx
+++ b/unoxml/inc/eventdispatcher.hxx
@@ -69,7 +69,7 @@ public:
const OUString& aType,
const css::uno::Reference< css::xml::dom::events::XEvent >& xEvent);
-bool dispatchEvent(
+void dispatchEvent(
DOM::CDocument & rDocument,
::osl::Mutex & rMutex,
xmlNodePtr const pNode,
diff --git a/unoxml/source/events/eventdispatcher.cxx
b/unoxml/source/events/eventdispatcher.cxx
index 85f6df5b9c14..ff5ce7aa8889 100644
--- a/unoxml/source/events/eventdispatcher.cxx
+++ b/unoxml/source/events/eventdispatcher.cxx
@@ -102,7 +102,7 @@ namespace DOM { namespace events {
}
}
-bool CEventDispatcher::dispatchEvent(
+void CEventDispatcher::dispatchEvent(
DOM::CDocument & rDocument, ::osl::Mutex & rMutex,
xmlNodePtr const pNode, Reference const& xNode,
Reference< XEvent > const& i_xEvent) const
@@ -117,7 +117,7 @@ namespace DOM { namespace events {
}
if (captureListeners.empty() && targetListeners.empty())
-return true;
+return;
CEvent *pEvent = nullptr; // pointer to internal event representation
@@ -222,7 +222,7 @@ namespace DOM { namespace events {
{
pEvent->m_currentTarget = rinode->first;
callListeners(captureListeners, rinode->second, aType, xEvent);
-if (pEvent->m_canceled) return true;
+if (pEvent->m_canceled) return;
++rinode;
}
@@ -232,7 +232,7 @@ namespace DOM { namespace events {
pEvent->m_phase = PhaseType_AT_TARGET;
pEvent->m_currentTarget = inode->first;
callListeners(targetListeners, inode->second, aType, xEvent);
-if (pEvent->m_canceled) return true;
+if (pEvent->m_canceled) return;
// bubbeling phase
++inode;
if (i_xEvent->getBubbles()) {
@@ -242,12 +242,11 @@ namespace DOM { namespace events {
pEvent->m_currentTarget = inode->first;
callListeners(targetListeners,
inode->second, aType, xEvent);
-if (pEvent->m_canceled) return true;
+if (pEvent->m_canceled) return;
++inode;
}
}
}
-return true;
}
}}
diff --git a/uui/source/iahndl-authentication.cxx
b/uui/source/iahndl-authentication.cxx
index 5aedeba76a04..d151a36138e7 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -724,7 +724,7 @@ UUIInteractionHelper::handlePasswordRequest(
return false;
}
-bool
+void
UUIInteractionHelper::handleAuthFallbackRequest( OUString & instructions,
OUString & url,
uno::Sequence< uno::Referen
[Libreoffice-commits] core.git: mysqlc/source
mysqlc/source/mysqlc_general.cxx |1 + mysqlc/source/mysqlc_preparedstatement.cxx |2 ++ 2 files changed, 3 insertions(+) New commits: commit 22828c32d1ae379782631a351aac34d0b1df95f4 Author: Rene Engelhard AuthorDate: Mon Aug 13 07:30:13 2018 +0200 Commit: Rene Engelhard CommitDate: Mon Aug 13 07:30:45 2018 +0200 fix build (missing #include 's) Change-Id: Idf0b21d41fa0bac0a49c1b28724c487edd336353 diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx index 8f3d0ed619d2..22e771275328 100644 --- a/mysqlc/source/mysqlc_general.cxx +++ b/mysqlc/source/mysqlc_general.cxx @@ -19,6 +19,7 @@ #include "mysqlc_general.hxx" #include "mysqlc_resultsetmetadata.hxx" +#include #include using com::sun::star::sdbc::SQLException; diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 9c6da76913e6..40e2ef172d8f 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -23,6 +23,8 @@ #include "mysqlc_propertyids.hxx" #include "mysqlc_resultsetmetadata.hxx" +#include + #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/ww8export.cxx |3 ++-
sw/source/filter/ww8/wrtww8.cxx |4 ++--
sw/source/filter/ww8/wrtww8.hxx |2 +-
sw/source/filter/ww8/ww8atr.cxx |2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 091aedc63de2f6c8f0f4c60dd1fa93fe4c6ddde4
Author: Justin Luth
AuthorDate: Sat Aug 4 13:55:47 2018 +0300
Commit: Justin Luth
CommitDate: Mon Aug 13 06:07:35 2018 +0200
tdf#117994 ww8export: extend Chp over CR
Plan to revert this within a month - just a test and see.
MS Word has a placeholder that can receive chacter formatting
for the carriage return, but LO doesn't really. So normally
when LO exports, the CR is "unformated", which really
can affect things like paragraph size, or numbering.
So, extend the current character formatting to cover
the CR, so that what we see in Writer is what we get in Word.
This will cause regressions as Writer round-trips documents
that it incorrectly reads. (In other words, even though they
don't look right in Writer, they still used toround-tripped
OK, but now they will be saved with LO's distortions.)
Since normally if we *save* in writer, that implies that
changes have been made, and theoretically the document
looks the way the user wants to re-preserve it, it
is better to now have the document look as Writer
sees it than to preserve some prior formatting.
This really breaks unit test tdf102334.doc, but that
round-tripped document is already *really* broken in Word.
With this patch, it looks like the original again.
(tdf102334.doc looks bad in LO no matter what, it just looks
worse in this case.)
Change-Id: I04d3fdc7dbc66f8732456d7ac5b309c454992d8b
Reviewed-on: https://gerrit.libreoffice.org/58594
Tested-by: Justin Luth
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index a53525a5ece7..25af135a35f7 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -675,7 +675,8 @@ DECLARE_WW8EXPORT_TEST(testTdf59896, "tdf59896.doc")
DECLARE_WW8EXPORT_TEST(testTdf102334, "tdf102334.doc")
{
// This was false, i.e. the first run wasn't hidden, when it should have
been
-CPPUNIT_ASSERT_EQUAL(true, getProperty(getRun(getParagraph(7), 1),
"CharHidden"));
+// But this looks different (less hidden) in MSWord
+// CPPUNIT_ASSERT_EQUAL(true, getProperty(getRun(getParagraph(7),
1), "CharHidden"));
}
DECLARE_WW8EXPORT_TEST(testTdf38778,
"tdf38778_properties_in_run_for_field.doc")
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 10f53ab15b05..6274a3acfca9 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -995,7 +995,7 @@ sal_uInt8 *WW8_WrPlcPn::CopyLastSprms(sal_uInt8 &rLen)
return rF.CopyLastSprms(rLen);
}
-void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8*
pSprms)
+void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8*
pSprms, const bool bExpandEmpty)
{
WW8_WrFkp* pF = m_Fkps.back().get();
@@ -1024,7 +1024,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short
nVarLen,const sal_uInt8* pS
pF->MergeToNew( nVarLen, pNewSprms );
// has the prev EndFC an empty sprm and the current is empty too, then
// expand only the old EndFc to the new EndFc
-else if( !nVarLen && pF->IsEmptySprm() )
+else if( !nVarLen && (bExpandEmpty || pF->IsEmptySprm()) )
{
pF->SetNewEnd( nEndFc );
return ;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index dde8717443c6..d7854815bae9 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1287,7 +1287,7 @@ private:
public:
WW8_WrPlcPn( WW8Export& rWrt, ePLCFT ePl, WW8_FC nStartFc );
~WW8_WrPlcPn();
-void AppendFkpEntry(WW8_FC nEndFc,short nVarLen = 0,const sal_uInt8*
pSprms = nullptr);
+void AppendFkpEntry(WW8_FC nEndFc,short nVarLen = 0,const sal_uInt8*
pSprms = nullptr, const bool bExpandEmpty=false);
void WriteFkps();
void WritePlc();
sal_uInt8 *CopyLastSprms(sal_uInt8 &rLen);
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 3f82fa3963dc..774684ee91b6 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1070,7 +1070,7 @@ void WW8AttributeOutput::OutputFKP(bool bForce)
if (!m_rWW8Export.pO->empty() || bForce)
{
m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
-m_rWW8Export.pO->size(), m_rWW8Export.pO->data() );
+m_rWW8Export.pO->size(), m_rWW8Export.pO->data(),
m_rWW8Export.pO->empty() );
m_rWW8Export.pO->clear();
}
}
___
Libreoffice-commits mailing list
libr
[Libreoffice-commits] online.git: loleaflet/js
loleaflet/js/toolbar.js | 23 ++-
1 file changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 1018589d44315ce96ea1e4d1ef7acd7e7c31da98
Author: Henry Castro
AuthorDate: Sun Aug 12 21:06:10 2018 -0400
Commit: Henry Castro
CommitDate: Sun Aug 12 21:20:19 2018 -0400
loleaflet: fix the number of users label from the status bar
Change-Id: I0b7e66c73a335295e5e61510bc0b68fc5c08ca58
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 98e7d6f5b..a08e81598 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -32,13 +32,6 @@ function _mobilify() {
statusbar.hide(item.id);
}
});
-
- nUsers = '%n';
- oneUser = '1';
- noUser = '0';
- updateUserListCount();
-
- $('#document-name-input').hide();
}
function resizeToolbar() {
@@ -1240,11 +1233,23 @@ function onDocLayerInit() {
break;
}
- toolbarUp.refresh();
- statusbar.refresh();
+
if (L.Browser.mobile) {
_mobilify();
+ nUsers = '%n';
+ oneUser = '1';
+ noUser = '0';
+ $('#document-name-input').hide();
+ } else {
+ nUsers = _('%n users');
+ oneUser = _('1 user');
+ noUser = _('0 users');
+ $('#document-name-input').show();
}
+
+ updateUserListCount();
+ toolbarUp.refresh();
+ statusbar.refresh();
}
function onCommandStateChanged(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/print_revamp' - include/vcl vcl/inc vcl/source
include/vcl/print.hxx |3 +++
vcl/inc/printdlg.hxx |1 +
vcl/source/gdi/print3.cxx | 15 +++
vcl/source/window/printdlg.cxx | 36
4 files changed, 51 insertions(+), 4 deletions(-)
New commits:
commit e14d9102a62bc3b3af17123d4307cda09f403351
Author: Daniel
AuthorDate: Sun Aug 12 17:32:30 2018 -0300
Commit: Daniel Silva
CommitDate: Mon Aug 13 01:29:14 2018 +0200
Resolves the mismatching behavior between page size and orientatin selection
Change-Id: I8482fa062441aac59fac7324b0987eb20face077
Reviewed-on: https://gerrit.libreoffice.org/58907
Tested-by: Jenkins
Reviewed-by: Daniel Silva
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index d4ec3219af3d..2e3cc1a79db7 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -557,7 +557,10 @@ public:
SAL_DLLPRIVATEbool getReversePrint() const;
SAL_DLLPRIVATEvoid setPapersizeFromSetup( bool
i_bPapersizeFromSetup );
SAL_DLLPRIVATEbool getPapersizeFromSetup() const;
+SAL_DLLPRIVATESize& getPaperSizeSetup() const;
SAL_DLLPRIVATEvoid setPaperSizeFromUser( Size i_aUserSize
);
+SAL_DLLPRIVATESize& getPaperSizeFromUser() const;
+SAL_DLLPRIVATEbool isPaperSizeFromUser() const;
VCL_PLUGIN_PUBLIC void setPrinterModified( bool
i_bPapersizeFromSetup );
VCL_PLUGIN_PUBLIC bool getPrinterModified() const;
SAL_DLLPRIVATEvoid pushPropertiesToPrinter();
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 3b6ad1827fa3..cbf91436f565 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -233,6 +233,7 @@ namespace vcl
void setPaperOrientation( Orientation eOrientation );
void updateOrientationBox( bool bAutomatic = true );
bool hasOrientationChanged() const;
+void checkPaperSize( Size& rPaperSize );
void setPreviewText();
void updatePrinterText();
void checkControlDependencies();
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index b56a5740a5fd..1fb481471180 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1382,6 +1382,11 @@ bool PrinterController::getPapersizeFromSetup() const
return mpImplData->mbPapersizeFromSetup;
}
+Size& PrinterController::getPaperSizeSetup() const
+{
+return mpImplData->maDefaultPageSize;
+}
+
void PrinterController::setPaperSizeFromUser( Size i_aUserSize )
{
mpImplData->mbPapersizeFromUser = true;
@@ -1391,6 +1396,16 @@ void PrinterController::setPaperSizeFromUser( Size
i_aUserSize )
mpImplData->maUserPageSize = i_aUserSize;
}
+Size& PrinterController::getPaperSizeFromUser() const
+{
+return mpImplData->maUserPageSize;
+}
+
+bool PrinterController::isPaperSizeFromUser() const
+{
+return mpImplData->mbPapersizeFromUser;
+}
+
void PrinterController::setPrinterModified( bool i_bPrinterModified )
{
mpImplData->mbPrinterModified = i_bPrinterModified;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 8308f11f7272..c62142d6cba4 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1037,11 +1037,36 @@ bool PrintDialog::hasOrientationChanged() const
|| (nOrientation == ORIENTATION_PORTRAIT && eOrientation ==
Orientation::Landscape);
}
-// Always use this function to set paper orientation in
-// order to update document orientation as well
+// make sure paper size matches paper orientation
+void PrintDialog::checkPaperSize( Size& rPaperSize )
+{
+Orientation eOrientation = maPController->getPrinter()->GetOrientation();
+if ( (eOrientation == Orientation::Portrait && rPaperSize.Width() >
rPaperSize.Height()) ||
+ (eOrientation == Orientation::Landscape && rPaperSize.Width() <
rPaperSize.Height()) )
+{
+rPaperSize = Size( rPaperSize.Height(), rPaperSize.Width() );
+}
+}
+
+// Always use this function to set paper orientation to make sure everything
behaves well
void PrintDialog::setPaperOrientation( Orientation eOrientation )
{
-maPController->getPrinter()->SetOrientation( eOrientation );
+VclPtr aPrt( maPController->getPrinter() );
+aPrt->SetOrientation( eOrientation );
+
+// check if it's necessary to swap width and height of paper
+if ( maPController->isPaperSizeFromUser() )
+{
+Size& aPaperSize = maPController->getPaperSizeFromUser();
+checkPaperSize( aPaperSize );
+}
+else if ( maPController->getPapersizeFromSetup() )
+{
+Size& aPaperSize = maPController->getPaperSizeSetup();
+checkPaperSize( aPaperSize );
+}
+
+// used to sync printer paper orientation with document orientation
maPController->setValue( "IsLandscape",
makeAny( stati
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sfx2/sdi
sfx2/sdi/sfx.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 789d2791c7c0f32f23dd96af44c1421a9c13a753 Author: Maxim Monastirsky AuthorDate: Sun Aug 12 15:40:50 2018 +0300 Commit: Adolfo Jayme Barrientos CommitDate: Mon Aug 13 00:30:29 2018 +0200 Don't show ShowImeStatusWindow in the customization dialog Change-Id: I5aeac6cf6ec9fae56c0dba3c176e0d6c52a28a5e Reviewed-on: https://gerrit.libreoffice.org/58899 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky (cherry picked from commit d42d937e6edb85bb8c2795cd54dc237e0da49bd6) Reviewed-on: https://gerrit.libreoffice.org/58902 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 9031982badb5..383817ab54a5 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4844,9 +4844,9 @@ SfxBoolItem ShowImeStatusWindow SID_SHOW_IME_STATUS_WINDOW RecordPerSet; -AccelConfig = TRUE, -MenuConfig = TRUE, -ToolBoxConfig = TRUE, +AccelConfig = FALSE, +MenuConfig = FALSE, +ToolBoxConfig = FALSE, GroupId = SfxGroupId::View; ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/karasa_jaga
icon-themes/karasa_jaga/cmd/32/saveas.png |binary icon-themes/karasa_jaga/cmd/32/saveasremote.png |binary icon-themes/karasa_jaga/cmd/32/saveastemplate.png |binary icon-themes/karasa_jaga/cmd/lc_saveas.png |binary icon-themes/karasa_jaga/cmd/lc_saveasremote.png |binary icon-themes/karasa_jaga/cmd/lc_saveastemplate.png |binary icon-themes/karasa_jaga/cmd/sc_saveas.png |binary icon-themes/karasa_jaga/cmd/sc_saveasremote.png |binary icon-themes/karasa_jaga/cmd/sc_saveastemplate.png |binary 9 files changed New commits: commit fe9f10a96fe25dd151b1040de14719a0b8e8e7a7 Author: Rizal Muttaqin AuthorDate: Sun Aug 12 13:20:11 2018 +0700 Commit: Adolfo Jayme Barrientos CommitDate: Mon Aug 13 00:29:41 2018 +0200 KJ:^save as * icons Change-Id: Ia87b3244e95e7515d1846a171c10e39ed0b644ed Reviewed-on: https://gerrit.libreoffice.org/58892 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/karasa_jaga/cmd/32/saveas.png b/icon-themes/karasa_jaga/cmd/32/saveas.png index 59ecc9ff3cbe..26cef9dfba6b 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/saveas.png and b/icon-themes/karasa_jaga/cmd/32/saveas.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/saveasremote.png b/icon-themes/karasa_jaga/cmd/32/saveasremote.png index 2387c5355dbb..b99acc4b8cbd 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/saveasremote.png and b/icon-themes/karasa_jaga/cmd/32/saveasremote.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/saveastemplate.png b/icon-themes/karasa_jaga/cmd/32/saveastemplate.png index 70f2d733b741..db8a9ae3e5bd 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/saveastemplate.png and b/icon-themes/karasa_jaga/cmd/32/saveastemplate.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_saveas.png b/icon-themes/karasa_jaga/cmd/lc_saveas.png index 1365e83885f5..2c508ffb9362 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_saveas.png and b/icon-themes/karasa_jaga/cmd/lc_saveas.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_saveasremote.png b/icon-themes/karasa_jaga/cmd/lc_saveasremote.png index 376b5a13847e..65d54b41d83a 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_saveasremote.png and b/icon-themes/karasa_jaga/cmd/lc_saveasremote.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_saveastemplate.png b/icon-themes/karasa_jaga/cmd/lc_saveastemplate.png index d53d5c0ab092..57c650beb882 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_saveastemplate.png and b/icon-themes/karasa_jaga/cmd/lc_saveastemplate.png differ diff --git a/icon-themes/karasa_jaga/cmd/sc_saveas.png b/icon-themes/karasa_jaga/cmd/sc_saveas.png index 0ed8c91d8469..9ef57a94a614 100644 Binary files a/icon-themes/karasa_jaga/cmd/sc_saveas.png and b/icon-themes/karasa_jaga/cmd/sc_saveas.png differ diff --git a/icon-themes/karasa_jaga/cmd/sc_saveasremote.png b/icon-themes/karasa_jaga/cmd/sc_saveasremote.png index 3c3eb6ff3f05..a63a00defbb8 100644 Binary files a/icon-themes/karasa_jaga/cmd/sc_saveasremote.png and b/icon-themes/karasa_jaga/cmd/sc_saveasremote.png differ diff --git a/icon-themes/karasa_jaga/cmd/sc_saveastemplate.png b/icon-themes/karasa_jaga/cmd/sc_saveastemplate.png index ffe11e98b7bf..235b759bc1f3 100644 Binary files a/icon-themes/karasa_jaga/cmd/sc_saveastemplate.png and b/icon-themes/karasa_jaga/cmd/sc_saveastemplate.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/40d308335db85bc99d20305b2bded216a38ef532/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: mysqlc/source
mysqlc/source/mysqlc_prepared_resultset.cxx |3 +++
mysqlc/source/mysqlc_preparedstatement.cxx | 21 +++--
2 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit aa6859f09068fa0380d0a23db4823f6ca1923037
Author: Tamas Bunth
AuthorDate: Wed Aug 8 17:08:22 2018 +0200
Commit: Tamás Bunth
CommitDate: Sun Aug 12 23:16:59 2018 +0200
mysqlc: Fix float, double and numeric types
Change-Id: I9d0b989735e736c9c35d8acf4ea1b072eddf7437
Reviewed-on: https://gerrit.libreoffice.org/58744
Tested-by: Jenkins
Reviewed-by: Tamás Bunth
diff --git a/mysqlc/source/mysqlc_prepared_resultset.cxx
b/mysqlc/source/mysqlc_prepared_resultset.cxx
index 3bc6b9424752..6ef50bea7116 100644
--- a/mysqlc/source/mysqlc_prepared_resultset.cxx
+++ b/mysqlc/source/mysqlc_prepared_resultset.cxx
@@ -239,6 +239,9 @@ double SAL_CALL OPreparedResultSet::getDouble(sal_Int32
column)
}
m_bWasNull = false;
+if (m_aFields[column - 1].type == MYSQL_TYPE_FLOAT)
+return *reinterpret_cast(m_aData[column - 1].buffer);
+
return *reinterpret_cast(m_aData[column - 1].buffer);
}
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx
b/mysqlc/source/mysqlc_preparedstatement.cxx
index 88b899a55814..9c6da76913e6 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -439,23 +439,24 @@ void SAL_CALL
OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co
case DataType::DECIMAL:
case DataType::NUMERIC:
{
-double nValue(0);
+double nValue(0.0);
+rtl::OUString sValue;
if ( value >>= nValue )
{
setDouble( parameterIndex, nValue );
break;
}
-else
+else if ( value >>= sValue )
{
-rtl::OUString sValue;
-if( value >>= sValue )
-{
-m_binds[nIndex].buffer_type = MYSQL_TYPE_NEWDECIMAL;
-mysqlc_sdbc_driver::resetSqlVar(&m_binds[nIndex].buffer,
sValue.getStr(), MYSQL_TYPE_LONGLONG, sValue.getLength());
-m_bindMetas[nIndex].is_null = 0;
-}
-
+rtl::OString sAscii = rtl::OUStringToOString(sValue,
getOwnConnection()->getConnectionEncoding());
+std::stringstream sStream{sAscii.getStr()};
+sStream >> nValue;
+m_binds[nIndex].buffer_type = MYSQL_TYPE_DOUBLE;
+mysqlc_sdbc_driver::resetSqlVar(&m_binds[nIndex].buffer, &nValue,
MYSQL_TYPE_DOUBLE, sValue.getLength());
+m_bindMetas[nIndex].is_null = 0;
+break;
}
+
#if defined __GNUC__ && __GNUC__ >= 7
[[fallthrough]];
#else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk mysqlc/source
mysqlc/Library_mysqlc.mk|3
mysqlc/source/mysqlc_connection.cxx | 140 +--
mysqlc/source/mysqlc_connection.hxx | 19
mysqlc/source/mysqlc_databasemetadata.cxx | 1127 ++--
mysqlc/source/mysqlc_databasemetadata.hxx |4
mysqlc/source/mysqlc_driver.cxx |2
mysqlc/source/mysqlc_general.cxx| 266 +-
mysqlc/source/mysqlc_general.hxx| 65 +
mysqlc/source/mysqlc_prepared_resultset.cxx | 1097 +++
mysqlc/source/mysqlc_prepared_resultset.hxx | 248 ++
mysqlc/source/mysqlc_preparedstatement.cxx | 510
mysqlc/source/mysqlc_preparedstatement.hxx | 24
mysqlc/source/mysqlc_resultset.cxx | 497 ++--
mysqlc/source/mysqlc_resultset.hxx | 20
mysqlc/source/mysqlc_resultsetmetadata.cxx | 247 +-
mysqlc/source/mysqlc_resultsetmetadata.hxx | 17
mysqlc/source/mysqlc_statement.cxx | 103 +-
mysqlc/source/mysqlc_statement.hxx | 12
18 files changed, 2724 insertions(+), 1677 deletions(-)
New commits:
commit 3478d7453a3d65b3d8d164e8f898a0b79f005c58
Author: Tamas Bunth
AuthorDate: Sun Jun 17 18:09:43 2018 +0200
Commit: Tamás Bunth
CommitDate: Sun Aug 12 23:15:21 2018 +0200
Switch from mysql to MariaDB C API
In order to get rid of the MySQL C++ Connector, the sdbc driver should
be implemented using the MariaDB C connector instead. MariaDB
Connector/C is LGPL licensed, so later it can be used in the
connectivity module. This way mysqlc won't be an extension, so it could
be maintained easier.
Change-Id: I99c13ccf154b33b145d34b1e06eec85946dc82a0
Reviewed-on: https://gerrit.libreoffice.org/55960
Reviewed-by: Tamás Bunth
Tested-by: Tamás Bunth
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 97f2b63500a2..39c6230d2f05 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -12,12 +12,14 @@ $(eval $(call gb_Library_Library,mysqlc))
$(eval $(call gb_Library_use_externals,mysqlc,\
boost_headers \
mysql-connector-cpp \
+ mariadb-connector-c \
))
ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
$(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz
-lm,\
-rdynamic -lz -lcrypt -lm)) \
+ $(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
))
endif
@@ -46,6 +48,7 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\
mysqlc/source/mysqlc_services \
mysqlc/source/mysqlc_connection \
mysqlc/source/mysqlc_resultset \
+ mysqlc/source/mysqlc_prepared_resultset \
mysqlc/source/mysqlc_resultsetmetadata \
mysqlc/source/mysqlc_statement \
mysqlc/source/mysqlc_preparedstatement \
diff --git a/mysqlc/source/mysqlc_connection.cxx
b/mysqlc/source/mysqlc_connection.cxx
index c9b4c6d2e471..73581734a293 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -61,12 +61,25 @@ using ::osl::MutexGuard;
#define MYSQLC_URI_PREFIX "sdbc:mysqlc:"
-OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
+namespace
+{
+void lcl_executeUpdate(MYSQL* pMySql, const rtl::OString& sql)
+{
+mysql_real_query(pMySql, sql.getStr(), sql.getLength());
+// TODO handle error
+}
+}
+
+OConnection::OConnection(MysqlCDriver& _rDriver)
:OMetaConnection_BASE(m_aMutex)
,m_xMetaData(nullptr)
,m_xDriver(&_rDriver)
-,cppDriver(_cppDriver)
{
+mysql_init(&m_mysql);
+
+// use TCP as connection
+mysql_protocol_type protocol = MYSQL_PROTOCOL_TCP;
+mysql_options(&m_mysql, MYSQL_OPT_PROTOCOL,
reinterpret_cast(&protocol));
}
OConnection::~OConnection()
@@ -144,29 +157,22 @@ void OConnection::construct(const rtl::OUString& url,
const Sequence< PropertyVa
}
if (!bEmbedded) {
-try {
-sql::ConnectOptionsMap connProps;
-std::string host_str = rtl::OUStringToOString(aHostName,
m_settings.encoding).getStr();
-std::string user_str = rtl::OUStringToOString(aUser,
m_settings.encoding).getStr();
-std::string pass_str = rtl::OUStringToOString(aPass,
m_settings.encoding).getStr();
-std::string schema_str = rtl::OUStringToOString(aDbName,
m_settings.encoding).getStr();
-connProps["hostName"] = sql::ConnectPropertyVal(host_str);
-connProps["userName"] = sql::ConnectPropertyVal(user_str);
-connProps["password"] = sql::ConnectPropertyVal(pass_str);
-connProps["schema"] = sql::ConnectPropertyVal(schema_str);
-connProps["port"] =
sql::ConnectPropertyVal(static_cast(nPort));
-if (unixSocketPassed) {
-sql::SQLString socket_str =
rtl::OUStringToOString(sUnixSocket, m_settings.encoding).getStr();
-connProps["socket"] = so
[Libreoffice-commits] core.git: sd/source solenv/flatpak-manifest.in
sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +-
solenv/flatpak-manifest.in | 15 ---
2 files changed, 1 insertion(+), 16 deletions(-)
New commits:
commit f465685aecf508be987ae199e77667af896a5e8f
Author: Arkadiy Illarionov
AuthorDate: Thu Aug 9 20:25:06 2018 +0300
Commit: Thorsten Behrens
CommitDate: Sun Aug 12 22:33:57 2018 +0200
Resolves: tdf#112343 remove last dbus-glib mentions
Remove dbus-glib bundle from flatpak since LibreOffice
doesn't depend on dbus-glib as of commit
02addb3618f026acd72ece76fc726b9473cc5940.
Fix dbus reference in comment.
Change-Id: I1f4bc41bcd0ea091fc199f2271b27079ce3c2c74
Reviewed-on: https://gerrit.libreoffice.org/58795
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index c89acf3daf58..0a13f5847ecb 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -959,7 +959,7 @@ setupBluez5Profile1(DBusConnection* pConnection,
std::vector* pCo
aVTable.message_function = ProfileMessageFunction;
// dbus_connection_try_register_object_path could be used but only exists
for
-// dbus-glib >= 1.2 -- we really shouldn't be trying this twice in any
case.
+// dbus >= 1.2 -- we really shouldn't be trying this twice in any case.
// (dbus_connection_try_register_object_path also returns an error with
more
// information which could be useful for debugging purposes.)
bErr = !dbus_connection_register_object_path(pConnection,
"/org/libreoffice/bluez/profile1", &aVTable, pCommunicators);
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 129e325cea12..3596916c79c7 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -44,21 +44,6 @@
]
},
{
-"name": "dbus-glib",
-"cleanup": [ "*.la", "/bin", "/etc", "/include", "/libexec",
"/share/gtk-doc", "/share/man" ],
-"config-opts": [
-"--disable-static",
-"--disable-gtk-doc"
-],
-"sources": [
-{
-"type": "archive",
-"url":
"https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.108.tar.gz";,
-"sha256":
"9f340c7e2352e9cdf113893ca77ca9075d9f8d5e81476bf2bf361099383c602c"
-}
-]
-},
-{
"name": "gvfs",
"cleanup": [ "/libexec/*", "/share/dbus-1/services/*",
"/share/gvfs/mounts" ],
"config-opts": [ "--disable-hal", "--disable-gdu",
"--disable-gcr", "--disable-obexftp",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/unx
vcl/unx/gtk3_kde5/kde5_filepicker.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9a024fee3e9cac648c2f57c23fe2ef5da00a5b29
Author: Katarina Behrens
AuthorDate: Fri Aug 10 14:36:00 2018 +0200
Commit: Thorsten Behrens
CommitDate: Sun Aug 12 22:30:12 2018 +0200
tdf#119133: Fix initial file and folder selection
what d7fc00e1f7ab7a44e6102a and 1af4ab72e2488515fcaede already does
for kde5
Change-Id: I924bdc5cfd6a12ff7bdbeef36d606c03307cb99b
Reviewed-on: https://gerrit.libreoffice.org/58832
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 87a4623a8dd5c9efed8335bb56145b9ea9dcce36)
Reviewed-on: https://gerrit.libreoffice.org/58906
Tested-by: Thorsten Behrens
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index ac8a1fec8183..16e50695b02c 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -91,9 +91,12 @@ void KDE5FilePicker::setMultiSelectionMode(bool multiSelect)
_dialog->setFileMode(multiSelect ? QFileDialog::ExistingFiles :
QFileDialog::ExistingFile);
}
-void KDE5FilePicker::setDefaultName(const QString& name) {
_dialog->selectUrl(QUrl(name)); }
+void KDE5FilePicker::setDefaultName(const QString& name) {
_dialog->selectFile(name); }
-void KDE5FilePicker::setDisplayDirectory(const QString& dir) {
_dialog->selectUrl(QUrl(dir)); }
+void KDE5FilePicker::setDisplayDirectory(const QString& dir)
+{
+_dialog->setDirectoryUrl(QUrl(dir));
+}
QString KDE5FilePicker::getDisplayDirectory() const { return
_dialog->directoryUrl().url(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3_kde5/kde5_filepicker.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 87a4623a8dd5c9efed8335bb56145b9ea9dcce36
Author: Katarina Behrens
AuthorDate: Fri Aug 10 14:36:00 2018 +0200
Commit: Thorsten Behrens
CommitDate: Sun Aug 12 22:29:20 2018 +0200
tdf#119133: Fix initial file and folder selection
what d7fc00e1f7ab7a44e6102a and 1af4ab72e2488515fcaede already does
for kde5
Change-Id: I924bdc5cfd6a12ff7bdbeef36d606c03307cb99b
Reviewed-on: https://gerrit.libreoffice.org/58832
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index f3b48b837836..e5bdd7e2646c 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -91,9 +91,12 @@ void KDE5FilePicker::setMultiSelectionMode(bool multiSelect)
_dialog->setFileMode(multiSelect ? QFileDialog::ExistingFiles :
QFileDialog::ExistingFile);
}
-void KDE5FilePicker::setDefaultName(const QString& name) {
_dialog->selectUrl(QUrl(name)); }
+void KDE5FilePicker::setDefaultName(const QString& name) {
_dialog->selectFile(name); }
-void KDE5FilePicker::setDisplayDirectory(const QString& dir) {
_dialog->selectUrl(QUrl(dir)); }
+void KDE5FilePicker::setDisplayDirectory(const QString& dir)
+{
+_dialog->setDirectoryUrl(QUrl(dir));
+}
QString KDE5FilePicker::getDisplayDirectory() const { return
_dialog->directoryUrl().url(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/Qt5Menu.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0adebdf09faa31c8f25415b6a8af415615d42e42
Author: Katarina Behrens
AuthorDate: Fri Aug 10 15:14:07 2018 +0200
Commit: Thorsten Behrens
CommitDate: Sun Aug 12 22:28:31 2018 +0200
Finally remove non-native menu bar
Change-Id: I4758bc5afa9f9eaced7763b9923250f27df14259
Reviewed-on: https://gerrit.libreoffice.org/58834
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 859f365aa3ea..b728f0b30160 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -27,7 +27,7 @@ Qt5Menu::Qt5Menu(bool bMenuBar)
Qt5Menu::~Qt5Menu() { maItems.clear(); }
-bool Qt5Menu::VisibleMenuBar() { return false; }
+bool Qt5Menu::VisibleMenuBar() { return true; }
void Qt5Menu::InsertItem(SalMenuItem* pSalMenuItem, unsigned nPos)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/qt5
vcl/inc/qt5/Qt5Frame.hxx |2
vcl/inc/qt5/Qt5Widget.hxx | 39 +-
vcl/qt5/Qt5Frame.cxx |4 -
vcl/qt5/Qt5Widget.cxx | 178 --
4 files changed, 73 insertions(+), 150 deletions(-)
New commits:
commit a7b18b63ec040a15b1008ec6ccb62e9733488a07
Author: Katarina Behrens
AuthorDate: Fri Aug 10 18:29:10 2018 +0200
Commit: Thorsten Behrens
CommitDate: Sun Aug 12 22:28:09 2018 +0200
Revert templatization of Qt5Widget class
it was not a step in the right direction in 1st place. We distinguish
between main window frame (QMainWindow) and everything else (QWidget)
differently now
Change-Id: I331c9760f7616b2f199e63e5e521df74b08acc62
Reviewed-on: https://gerrit.libreoffice.org/58853
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 04ade0b38b2d..3bec15f1ecf4 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -39,7 +39,7 @@ class SvpSalGraphics;
class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
{
-friend class VclQtMixinBase;
+friend class Qt5Widget;
QWidget* m_pQWidget;
Qt5MainWindow* m_pTopLevel;
diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index 206b8b2d1d6e..19bbb9ff9e55 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -21,8 +21,43 @@
#include
-#include "Qt5Frame.hxx"
+class Qt5Frame;
+class Qt5Object;
+class QFocusEvent;
+class QKeyEvent;
+class QMouseEvent;
+class QMoveEvent;
+class QPaintEvent;
+class QResizeEvent;
+class QShowEvent;
+class QWheelEvent;
-QWidget* createQt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f);
+class Qt5Widget : public QWidget
+{
+Q_OBJECT
+
+Qt5Frame* m_pFrame;
+
+bool handleKeyEvent(QKeyEvent*, bool);
+void handleMouseButtonEvent(QMouseEvent*, bool);
+
+virtual void focusInEvent(QFocusEvent*) override;
+virtual void focusOutEvent(QFocusEvent*) override;
+virtual void keyPressEvent(QKeyEvent*) override;
+virtual void keyReleaseEvent(QKeyEvent*) override;
+virtual void mouseMoveEvent(QMouseEvent*) override;
+virtual void mousePressEvent(QMouseEvent*) override;
+virtual void mouseReleaseEvent(QMouseEvent*) override;
+virtual void moveEvent(QMoveEvent*) override;
+virtual void paintEvent(QPaintEvent*) override;
+virtual void resizeEvent(QResizeEvent*) override;
+virtual void showEvent(QShowEvent*) override;
+virtual void wheelEvent(QWheelEvent*) override;
+virtual void closeEvent(QCloseEvent*) override;
+
+public:
+Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags());
+virtual ~Qt5Widget() override;
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index ab8d51fdb336..f609f3cbaa5b 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -101,11 +101,11 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags
nStyle, bool bUseCairo)
if (!pParent && (aWinFlags == Qt::Window))
{
m_pTopLevel = new Qt5MainWindow(*this, nullptr, aWinFlags);
-m_pQWidget = createQt5Widget(*this, aWinFlags);
+m_pQWidget = new Qt5Widget(*this, aWinFlags);
m_pTopLevel->setCentralWidget(m_pQWidget);
}
else
-m_pQWidget = createQt5Widget(*this, aWinFlags);
+m_pQWidget = new Qt5Widget(*this, aWinFlags);
if (pParent && !(pParent->m_nStyle & SalFrameStyleFlags::PLUG))
{
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index f4008ed8fb0a..bb79b7cd6130 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -38,54 +38,28 @@
#include
#include
-class VclQtMixinBase
+void Qt5Widget::paintEvent(QPaintEvent* pEvent)
{
-public:
-VclQtMixinBase(Qt5Frame* pFrame) { m_pFrame = pFrame; }
-
-void mixinFocusInEvent(QFocusEvent*);
-void mixinFocusOutEvent(QFocusEvent*);
-void mixinKeyPressEvent(QKeyEvent*);
-void mixinKeyReleaseEvent(QKeyEvent*);
-void mixinMouseMoveEvent(QMouseEvent*);
-void mixinMousePressEvent(QMouseEvent*);
-void mixinMouseReleaseEvent(QMouseEvent*);
-void mixinMoveEvent(QMoveEvent*);
-void mixinPaintEvent(QPaintEvent*, QWidget* widget);
-void mixinResizeEvent(QResizeEvent*, QSize aSize);
-void mixinShowEvent(QShowEvent*);
-void mixinWheelEvent(QWheelEvent*);
-void mixinCloseEvent(QCloseEvent*);
-
-private:
-bool mixinHandleKeyEvent(QKeyEvent*, bool);
-void mixinHandleMouseButtonEvent(QMouseEvent*, bool);
-
-Qt5Frame* m_pFrame;
-};
-
-void VclQtMixinBase::mixinPaintEvent(QPaintEvent* pEvent, QWidget* widget)
-{
-QPainter p(widget);
+QPainter p(this);
if (m_pFrame->m_bUseCairo)
{
cairo_surface_t* pSurface = m_pFrame->m_pSurface.get();
cairo_surface_flush(pSurface);
-QImage aImage(cairo_image_surface_get_data(pSurface),
widget->size().width(),
-
[Libreoffice-commits] core.git: vcl/CustomTarget_qt5_moc.mk vcl/inc vcl/Library_vclplug_qt5.mk vcl/qt5
vcl/CustomTarget_qt5_moc.mk |1
vcl/Library_vclplug_qt5.mk|1
vcl/inc/qt5/Qt5Frame.hxx | 12 -
vcl/inc/qt5/Qt5MainWindow.hxx | 41 ++
vcl/inc/qt5/Qt5Widget.hxx |2
vcl/qt5/Qt5Frame.cxx | 92 +++---
vcl/qt5/Qt5MainWindow.cxx | 36
vcl/qt5/Qt5Menu.cxx |4 -
vcl/qt5/Qt5Widget.cxx | 34 +--
9 files changed, 172 insertions(+), 51 deletions(-)
New commits:
commit 8d791a9d9657f6573ce27947c0289b36c6eba77c
Author: Katarina Behrens
AuthorDate: Thu Aug 9 17:14:14 2018 +0200
Commit: Thorsten Behrens
CommitDate: Sun Aug 12 22:25:54 2018 +0200
Set Qt5Widget to be a central widget of QMainWindow
this is meant to solve the problem of native menu bar overlapping
w/ non-native, as well as the inability to place an object or select
text dragging the mouse cursor w/ LMB pressed
Change-Id: I29f590ebf79d1ecc7e17b402125384cf13774bf3
Reviewed-on: https://gerrit.libreoffice.org/58171
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk
index 3962a730d388..afce4d44fd2b 100644
--- a/vcl/CustomTarget_qt5_moc.mk
+++ b/vcl/CustomTarget_qt5_moc.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/qt5))
$(call gb_CustomTarget_get_target,vcl/qt5) : \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5FilePicker.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Instance.moc \
+ $(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5MainWindow.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Menu.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Timer.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Widget.moc \
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 1ad01555ed3a..d66a82319ed2 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -92,6 +92,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
vcl/qt5/Qt5Graphics_Text \
vcl/qt5/Qt5Instance \
vcl/qt5/Qt5Instance_Print \
+vcl/qt5/Qt5MainWindow \
vcl/qt5/Qt5Menu \
vcl/qt5/Qt5Object \
vcl/qt5/Qt5Painter \
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 310298879e52..04ade0b38b2d 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -31,7 +31,9 @@ class Qt5Graphics;
class Qt5Instance;
class Qt5Menu;
class QWidget;
+class Qt5MainWindow;
class QPaintDevice;
+class QScreen;
class QImage;
class SvpSalGraphics;
@@ -39,7 +41,8 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
{
friend class VclQtMixinBase;
-std::unique_ptr m_pQWidget;
+QWidget* m_pQWidget;
+Qt5MainWindow* m_pTopLevel;
const bool m_bUseCairo;
std::unique_ptr m_pQImage;
@@ -76,6 +79,10 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
return bool(m_nStyle & nMask);
}
+bool isWindow();
+QWindow* windowHandle();
+QScreen* screen();
+
void TriggerPaintEvent();
void TriggerPaintEvent(QRect aRect);
@@ -83,7 +90,8 @@ public:
Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nSalFrameStyle, bool
bUseCairo);
virtual ~Qt5Frame() override;
-QWidget* GetQWidget() const { return m_pQWidget.get(); }
+QWidget* GetQWidget() const { return m_pQWidget; }
+Qt5MainWindow* GetTopLevelWindow() const { return m_pTopLevel; }
void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32
nExtentsWidth,
sal_Int32 nExtentsHeight) const;
diff --git a/vcl/inc/qt5/Qt5MainWindow.hxx b/vcl/inc/qt5/Qt5MainWindow.hxx
new file mode 100644
index ..caac2299c4bc
--- /dev/null
+++ b/vcl/inc/qt5/Qt5MainWindow.hxx
@@ -0,0 +1,41 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+#include
+#include
+
+#include "Qt5Frame.hxx"
+
+class Qt5MainWindow : public QMainWindow
+{
+Q_OBJECT
+
+Qt5Frame* m_pFrame;
+
+virtual void closeEvent(QCloseEvent* pEvent) override;
+
+pu
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 13/2f1cb8837a2eb94204e714e62cc6337e51d6c1
13/2f1cb8837a2eb94204e714e62cc6337e51d6c1 |1 + 1 file changed, 1 insertion(+) New commits: commit c41efae78b7baf71fda3afd96c7c49723a37bada Author: Caolán McNamara AuthorDate: Sun Aug 12 21:25:26 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Aug 12 21:25:26 2018 +0100 Notes added by 'git notes add' diff --git a/13/2f1cb8837a2eb94204e714e62cc6337e51d6c1 b/13/2f1cb8837a2eb94204e714e62cc6337e51d6c1 new file mode 100644 index ..ad8ee065e211 --- /dev/null +++ b/13/2f1cb8837a2eb94204e714e62cc6337e51d6c1 @@ -0,0 +1 @@ +prefer: 70d9c5248156302d6cd7d01e76646e252c4a1b6f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 81/d6ce7b52b73c0dcff3aeb4223d536c0c9e7874
81/d6ce7b52b73c0dcff3aeb4223d536c0c9e7874 |1 + 1 file changed, 1 insertion(+) New commits: commit 57ebc72872891cf7d73bb1a5a4494cb1b70e005c Author: Caolán McNamara AuthorDate: Sun Aug 12 21:24:43 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Aug 12 21:24:43 2018 +0100 Notes added by 'git notes add' diff --git a/81/d6ce7b52b73c0dcff3aeb4223d536c0c9e7874 b/81/d6ce7b52b73c0dcff3aeb4223d536c0c9e7874 new file mode 100644 index ..ad8ee065e211 --- /dev/null +++ b/81/d6ce7b52b73c0dcff3aeb4223d536c0c9e7874 @@ -0,0 +1 @@ +prefer: 70d9c5248156302d6cd7d01e76646e252c4a1b6f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 79/3b66d942edd74e9e0368895575e48527e0793a
79/3b66d942edd74e9e0368895575e48527e0793a |1 + 1 file changed, 1 insertion(+) New commits: commit 01c004732f787690cc11f09439ee08ed6c08a867 Author: Caolán McNamara AuthorDate: Sun Aug 12 21:23:53 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Aug 12 21:23:53 2018 +0100 Notes added by 'git notes add' diff --git a/79/3b66d942edd74e9e0368895575e48527e0793a b/79/3b66d942edd74e9e0368895575e48527e0793a new file mode 100644 index ..cc1a090ebb1d --- /dev/null +++ b/79/3b66d942edd74e9e0368895575e48527e0793a @@ -0,0 +1 @@ +prefer: ae850353151cd6a79f7b4a012d0a411013c841a4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 07/755074deaf232dfa8a6c61d0f311fe2b470591
07/755074deaf232dfa8a6c61d0f311fe2b470591 |1 + 1 file changed, 1 insertion(+) New commits: commit 77de0315c35da6a267c6391f85233ab0693b5a06 Author: Caolán McNamara AuthorDate: Sun Aug 12 21:21:04 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Aug 12 21:21:04 2018 +0100 Notes added by 'git notes add' diff --git a/07/755074deaf232dfa8a6c61d0f311fe2b470591 b/07/755074deaf232dfa8a6c61d0f311fe2b470591 new file mode 100644 index ..8e5c182e7789 --- /dev/null +++ b/07/755074deaf232dfa8a6c61d0f311fe2b470591 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9d/1255242ea58a2f5cdd5f87f19ef84348188ed9
9d/1255242ea58a2f5cdd5f87f19ef84348188ed9 |1 + 1 file changed, 1 insertion(+) New commits: commit cde82dd6d520b4cf5e6360fd8871e641089c2df7 Author: Caolán McNamara AuthorDate: Sun Aug 12 21:21:45 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Aug 12 21:21:45 2018 +0100 Notes added by 'git notes add' diff --git a/9d/1255242ea58a2f5cdd5f87f19ef84348188ed9 b/9d/1255242ea58a2f5cdd5f87f19ef84348188ed9 new file mode 100644 index ..17bf032cdd87 --- /dev/null +++ b/9d/1255242ea58a2f5cdd5f87f19ef84348188ed9 @@ -0,0 +1 @@ +prefer: 75ee75cd5e6b2bf98f4918bb586eac8af935e0c7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 72/23961287c78f848bc3f702a3c1b6340365e098
72/23961287c78f848bc3f702a3c1b6340365e098 |1 + 1 file changed, 1 insertion(+) New commits: commit e427417e2634a84327297f5e49c61c28757d1eac Author: Caolán McNamara AuthorDate: Sun Aug 12 21:20:48 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Aug 12 21:20:48 2018 +0100 Notes added by 'git notes add' diff --git a/72/23961287c78f848bc3f702a3c1b6340365e098 b/72/23961287c78f848bc3f702a3c1b6340365e098 new file mode 100644 index ..6db07576b960 --- /dev/null +++ b/72/23961287c78f848bc3f702a3c1b6340365e098 @@ -0,0 +1 @@ +prefer: 20452aa248c8d32289736e0a3aef6a3caafc3ce5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh
bin/oss-fuzz-build.sh |2 ++ 1 file changed, 2 insertions(+) New commits: commit 20444972edb1dd49af13902a850a8e343d5a60ec Author: Caolán McNamara AuthorDate: Sun Aug 12 21:12:48 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Aug 12 22:15:22 2018 +0200 add make clean to oss-fuzz build Change-Id: Ic591748eedbe82b1c7305ef68156370f1b97f216 Reviewed-on: https://gerrit.libreoffice.org/58904 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh index e93105d4f669..5cc1325c6980 100755 --- a/bin/oss-fuzz-build.sh +++ b/bin/oss-fuzz-build.sh @@ -47,3 +47,5 @@ cp $SRC/*_seed_corpus.zip $OUT cp $SRC/*.dict $OUT #options files cp $SRC/libreoffice/vcl/workben/*.options $OUT + +make clean ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/scmatrix.hxx |4 ++--
sc/source/core/tool/interpr3.cxx |4 ++--
sc/source/core/tool/scmatrix.cxx | 18 +++---
3 files changed, 11 insertions(+), 15 deletions(-)
New commits:
commit bb6f2b12e8f0bbc99a5ca93141d35fd40b043e55
Author: Noel Grandin
AuthorDate: Sat Aug 11 13:25:09 2018 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 12 21:05:09 2018 +0200
loplugin:constantparam
Change-Id: I676a8408e97cc8134009f764736cad68513c89ad
Reviewed-on: https://gerrit.libreoffice.org/58875
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index b681fc2d0c23..c7e50fe408ab 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -396,7 +396,7 @@ public:
virtual void DivOp(bool bFlag, double fVal, ScMatrix& rMat) = 0;
virtual void PowOp(bool bFlag, double fVal, ScMatrix& rMat) = 0;
-virtual std::vector Collect(bool bTextAsZero,
const std::vector>& aOp) = 0;
+virtual std::vector Collect(const
std::vector>& aOp) = 0;
virtual void ExecuteOperation(const std::pair& rStartPos,
const std::pair& rEndPos,
DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc,
StringOpFunction aStringFunc,
@@ -614,7 +614,7 @@ public:
virtual void DivOp(bool bFlag, double fVal, ScMatrix& rMat) override;
virtual void PowOp(bool bFlag, double fVal, ScMatrix& rMat) override;
-virtual std::vector Collect(bool bTextAsZero,
const std::vector>& aOp) override;
+virtual std::vector Collect(const
std::vector>& aOp) override;
virtual void ExecuteOperation(const std::pair& rStartPos,
const std::pair& rEndPos,
DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc,
StringOpFunction aStringFunc,
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 689ea4e4de59..7c46264f83e0 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2744,12 +2744,12 @@ void ScInterpreter::ScFTest()
aOp.emplace_back(new sc::op::Op(0.0, [](double& rAccum, double
fVal){rAccum += fVal;}));
aOp.emplace_back(new sc::op::Op(0.0, [](double& rAccum, double
fVal){rAccum += fVal * fVal;}));
-auto aVal1 = pMat1->Collect(false, aOp);
+auto aVal1 = pMat1->Collect(aOp);
fSum1 = aVal1[0].mfFirst + aVal1[0].mfRest;
fSumSqr1 = aVal1[1].mfFirst + aVal1[1].mfRest;
fCount1 = aVal1[2].mnCount;
-auto aVal2 = pMat2->Collect(false, aOp);
+auto aVal2 = pMat2->Collect(aOp);
fSum2 = aVal2[0].mfFirst + aVal2[0].mfRest;
fSumSqr2 = aVal2[1].mfFirst + aVal2[1].mfRest;
fCount2 = aVal2[2].mnCount;
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index b84e1fa19282..679eb35a4c10 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -324,7 +324,7 @@ public:
const ScFullMatrix::EmptyOpFunction& aEmptyFunc) const;
template
-std::vector ApplyCollectOperation(bool
bTextAsZero, const std::vector>& aOp);
+std::vector ApplyCollectOperation(const
std::vector>& aOp);
void MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrixRef& xMat1,
const ScMatrixRef& xMat2,
SvNumberFormatter& rFormatter, svl::SharedStringPool& rPool);
@@ -1178,10 +1178,9 @@ class WalkElementBlocksMultipleValues
const std::vector>& maOp;
std::vector maRes;
bool mbFirst:1;
-bool mbTextAsZero:1;
public:
-WalkElementBlocksMultipleValues(bool bTextAsZero, const
std::vector>& aOp) :
-maOp(aOp), mbFirst(true), mbTextAsZero(bTextAsZero)
+WalkElementBlocksMultipleValues(const std::vector>&
aOp) :
+maOp(aOp), mbFirst(true)
{
for (const auto& rpOp : maOp)
{
@@ -1251,9 +1250,6 @@ public:
}
break;
case mdds::mtm::element_string:
-if (mbTextAsZero)
-maRes.back().mnCount += node.size;
-break;
case mdds::mtm::element_empty:
default:
;
@@ -2402,9 +2398,9 @@ void ScMatrixImpl::ApplyOperation(T aOp, ScMatrixImpl&
rMat)
}
template
-std::vector ScMatrixImpl::ApplyCollectOperation(bool
bTextAsZero, const std::vector>& aOp)
+std::vector ScMatrixImpl::ApplyCollectOperation(const
std::vector>& aOp)
{
-WalkElementBlocksMultipleValues aFunc(bTextAsZero, aOp);
+WalkElementBlocksMultipleValues aFunc(aOp);
maMat.walk(aFunc);
return aFunc.getResult();
}
@@ -3453,9 +3449,9 @@ void ScFullMatrix::ExecuteOperation(const
std::pair& rStartPos,
pImpl->ExecuteOperation(rStartPos, rEndPos, aDoubleFunc, aBoolFunc,
aStringFunc, aEmptyFunc);
}
-std::vector ScFullMatrix::Collect(bool bTextAsZero,
const std::vector>& aOp)
+std::vector ScFullMatrix::Collect(const
std::vector>& aOp)
{
-return pImpl->ApplyCollectOperation(bTextAsZero, aOp);
+return pImpl->ApplyCollectOperation(aOp);
}
ScFullMatrix
Re: Error on First Run in Windows: Solar Mutex not owned
Hi, with a recent build (win10 x64 Version: 6.2.0.0.alpha0+ (x64) Build ID: d19482e191b8839f3b552e3b6e5e91ead70d565f) i get several errors at first start (if the user profile is *empty*) i noticed: the folder " 'instdir/user/extensions" seems to cause the problem. lo will start without errors if the folder exists. Regards Oliver --- Microsoft Visual C++ Runtime Library --- Assertion failed! Program: D:\sources\libo-core\instdir\program\vcllo.dll File: D:/sources/libo-core/vcl/win/app/salinst.cxx Line: 647 Expression: pTimer != nullptr For information on how your program can cause an assertion failure, see the Visual C++ documentation on asserts (Press Retry to debug the application - JIT must be enabled) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/sdi
sfx2/sdi/sfx.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit d42d937e6edb85bb8c2795cd54dc237e0da49bd6 Author: Maxim Monastirsky AuthorDate: Sun Aug 12 15:40:50 2018 +0300 Commit: Maxim Monastirsky CommitDate: Sun Aug 12 20:21:14 2018 +0200 Don't show ShowImeStatusWindow in the customization dialog Change-Id: I5aeac6cf6ec9fae56c0dba3c176e0d6c52a28a5e Reviewed-on: https://gerrit.libreoffice.org/58899 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 927957e3684f..235544588174 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4844,9 +4844,9 @@ SfxBoolItem ShowImeStatusWindow SID_SHOW_IME_STATUS_WINDOW RecordPerSet; -AccelConfig = TRUE, -MenuConfig = TRUE, -ToolBoxConfig = TRUE, +AccelConfig = FALSE, +MenuConfig = FALSE, +ToolBoxConfig = FALSE, GroupId = SfxGroupId::View; ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source wizards/source
cui/source/tabpages/numpages.cxx |2 +- wizards/source/access2base/Methods.xba |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 7c93e4d72f74b57b335617717e6e4788022d5369 Author: Andrea Gelmini AuthorDate: Sun Aug 12 16:14:04 2018 +0200 Commit: Julien Nabet CommitDate: Sun Aug 12 18:09:33 2018 +0200 Fix typos Change-Id: I673b9121968ff79e6313e4019bc02a3364b4737f Reviewed-on: https://gerrit.libreoffice.org/58901 Reviewed-by: Jean-Pierre Ledure Tested-by: Jean-Pierre Ledure Tested-by: Jenkins diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index abb258b84ef0..439086981462 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2246,7 +2246,7 @@ static long lcl_DrawBullet(VirtualDevice* pVDev, aTmpSize.setWidth( aTmpSize.Width() / 100 ) ; aTmpSize.setHeight( aTmpSize.Height() * ( rFmt.GetBulletRelSize()) ); aTmpSize.setHeight( aTmpSize.Height() / 100 ) ; -// in case of a height of zero it is drawed in original height +// in case of a height of zero it is drawn in original height if(!aTmpSize.Height()) aTmpSize.setHeight( 1 ); aFont.SetFontSize(aTmpSize); diff --git a/wizards/source/access2base/Methods.xba b/wizards/source/access2base/Methods.xba index d48703169dfb..2d5906c7c5bb 100644 --- a/wizards/source/access2base/Methods.xba +++ b/wizards/source/access2base/Methods.xba @@ -216,7 +216,7 @@ Dim vOptionButtons() As Variant, sGroupName As String Dim lXY() As Long, iIndex() As Integer ' Two indexes X-Y coordinates Dim oView As Object, oDatabaseForm As Object, vControls As Variant -Const cstPixels = 10 ' Tolerance on coordinates when drawed approximately +Const cstPixels = 10 ' Tolerance on coordinates when drawn approximately bFound = False Select Case psParentType @@ -296,4 +296,4 @@ Error_Function: GoTo Exit_Function End Function ' _OptionGroupV1.1.0 - \ 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] help.git: help3xsl/help.html
help3xsl/help.html | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit 9e4660049b5f4c6da3c652f068186e52a360ae3b Author: Jan Holesovsky AuthorDate: Fri Aug 10 17:20:07 2018 +0200 Commit: Olivier Hallot CommitDate: Sun Aug 12 16:20:25 2018 +0200 Avoid several JS errors. Change-Id: If0b8b4f3e8c3464f4e7f812ba727a929330438f3 Reviewed-on: https://gerrit.libreoffice.org/58864 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/help.html b/help3xsl/help.html index acaf55b2d..42f1296f0 100644 --- a/help3xsl/help.html +++ b/help3xsl/help.html @@ -8,11 +8,25 @@ --> -
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2a18492fcd707ca087ccc0bcabd79d26d9f4aaee Author: Jan Holesovsky AuthorDate: Fri Aug 10 17:20:07 2018 +0200 Commit: Gerrit Code Review CommitDate: Sun Aug 12 16:20:25 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Avoid several JS errors. Change-Id: If0b8b4f3e8c3464f4e7f812ba727a929330438f3 Reviewed-on: https://gerrit.libreoffice.org/58864 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 7ab3eded419b..9e4660049b5f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7ab3eded419b6fddbdd9d7a7c1f676b3720950c0 +Subproject commit 9e4660049b5f4c6da3c652f068186e52a360ae3b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
Hi,
On Sun, Aug 12, 2018 at 04:58:52PM +0300, Maxim Monastirsky wrote:
> On Sun, 2018-08-12 at 14:43 +0200, Rene Engelhard wrote:
> > so vcl/source/app/IconThemeSelector.cxx
> >
> > > installedThemes)
> > > {
> > > if (!installedThemes.empty()) {
> > > return installedThemes.front().GetThemeId();
> > > }
> > > else {
> > > return FALLBACK_ICON_THEME_ID;
> > > }
> > > }
> >
> >
> > $ git grep FALLBACK_ICON_THEME_ID
> > source/app/IconThemeSelector.cxx:/*static*/ const OUStringLiteral
> > IconThemeSelector::FALLBACK_ICON_THEME_ID("tango");
> >
> > ^
> > ^
> >
>
> IconThemeSelector::ReturnFallback has a parameter const
> std::vector& installedThemes. The code which calls this
> method, passes there a reference to IconThemeScanner::mFoundIconThemes,
> which dynamically filled with the themes found in the installation
> folder. Now, it returns FALLBACK_ICON_THEME_ID (currently set to tango)
> only if installedThemes.empty(), meaning that we couldn't find any icon
> theme in the installation folder (including tango!). So normally, when
> there is at least one theme installed, this "return
> FALLBACK_ICON_THEME_ID" will never happen.
Ah, I see, didn't look that deep I have to admit. And because one other
theme is installed (tango) it took that one and it broke.
Thanks for the explanation.
(As said: libreoffice-common now Depends: libreoffice-style-colibre,
libreoffice-style-tango so it should now work in all "default" cases.
And -gnome/-kde Depends: libreoffice-style-elementary /
libreoffice-style-breeze for their iconsets)
Regards,
Rene
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
On Sun, 2018-08-12 at 14:43 +0200, Rene Engelhard wrote:
> so vcl/source/app/IconThemeSelector.cxx
>
> > installedThemes)
> > {
> > if (!installedThemes.empty()) {
> > return installedThemes.front().GetThemeId();
> > }
> > else {
> > return FALLBACK_ICON_THEME_ID;
> > }
> > }
>
>
> $ git grep FALLBACK_ICON_THEME_ID
> source/app/IconThemeSelector.cxx:/*static*/ const OUStringLiteral
> IconThemeSelector::FALLBACK_ICON_THEME_ID("tango");
>
> ^
> ^
>
IconThemeSelector::ReturnFallback has a parameter const
std::vector& installedThemes. The code which calls this
method, passes there a reference to IconThemeScanner::mFoundIconThemes,
which dynamically filled with the themes found in the installation
folder. Now, it returns FALLBACK_ICON_THEME_ID (currently set to tango)
only if installedThemes.empty(), meaning that we couldn't find any icon
theme in the installation folder (including tango!). So normally, when
there is at least one theme installed, this "return
FALLBACK_ICON_THEME_ID" will never happen.
Maxim
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: help3xsl/help.html help3xsl/index2.html
help3xsl/help.html | 22 ++---
help3xsl/index2.html | 86 +--
2 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit 7ab3eded419b6fddbdd9d7a7c1f676b3720950c0
Author: Jan Holesovsky
AuthorDate: Fri Aug 10 21:08:47 2018 +0200
Commit: Olivier Hallot
CommitDate: Sun Aug 12 15:45:51 2018 +0200
Use window.location.href = ...; instead of window.open(..., '_self');
Otherwise the interim URLs end up in the history.
Change-Id: If99aa1a29126f93387d2f5a6460cc0d43b488cd9
Reviewed-on: https://gerrit.libreoffice.org/58867
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/help3xsl/help.html b/help3xsl/help.html
index 1dade67f0..acaf55b2d 100644
--- a/help3xsl/help.html
+++ b/help3xsl/help.html
@@ -14,17 +14,17 @@
var url = window.location.href;
-var n = url.indexOf('help.html?');
-if (n != -1){
-// the URL came from LibreOffice help (F1)
-var version = getParameterByName("Version",url);
-var rest = url.substr(n+12,url.length);
-var newURL = version+'/index.html?'+rest;
-window.open(newURL,'_self');
-}else{
-// URL came from elsewhere, direct access to webroot, we redirect to main
Help page
-var userLang = navigator.language || navigator.userLanguage;
-
window.open('latest/'+userLang+'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self');
+var n = url.indexOf('?');
+if (n != -1) {
+// the URL came from LibreOffice help (F1)
+var version = getParameterByName("Version", url);
+var query = url.substr(n + 1, url.length);
+var newURL = version + '/index.html?' + query;
+window.location.href = newURL;
+} else {
+// URL came from elsewhere, direct access to webroot, we redirect to
main Help page
+var userLang = navigator.language || navigator.userLanguage;
+window.location.href = 'latest/' + userLang +
'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN';
}
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 6ca41cc90..4f7c744e2 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -16,49 +16,49 @@
var url = window.location.href;
var n = url.indexOf('index.html?');
-if (n != -1){
-// the URL came from LibreOffice help (F1)
-var version = getParameterByName("Version",url);
-var lang = getParameterByName("Language",url);
-var system = getParameterByName("System",url);
-var rest= url.substr(n+11,url.length);
-var module;
-var defaultFile;
-var smodule = rest.substr(0, rest.indexOf('/'));
-switch (smodule) {
-case "swriter":
{defaultFile='text/swriter/main.html';module="WRITER";break;}
-case "scalc":
{defaultFile='text/scalc/main.html';module="CALC";break;}
-case "simpress":
{defaultFile='text/simpress/main.html';module="IMPRESS";break;}
-case "sdraw":
{defaultFile='text/sdraw/main.html';module="DRAW";break;}
-case "smath":
{defaultFile='text/smath/main.html';module="MATH";break;}
-case "sdatabase":
{defaultFile='text/shared/explorer/database/main.html';module="BASE";break;}
-case "sbasic":
{defaultFile='text/sbasic/shared/main0601.html';module="BASIC";break;}
-default:
{defaultFile='text/shared/main.html';module="WRITER";break;}
-}
-var bookmark = rest.slice(rest.indexOf('/')+1, rest.indexOf('?'));
-var file = map[bookmark];
-// check first if a root bookmark @@nowidget@@ can be used
-if (file === undefined){
-var b2 = bookmark.substring(0, bookmark.lastIndexOf("/")) +
'/@@nowidget@@';
-file = map[b2];
-}
-// rebuild URL
-if (file === undefined){
-var newURL = lang + '/' + defaultFile + '?System=' + system + '&DbPAR=' +
module;
-}else{
-var indx = file.indexOf('#');
-var bm = file.substr(indx,file.length);
-file = file.substr(0,indx);
-var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' + module
+ bm;
-}
-window.open(newURL,'_self');
-}else{
-// URL came from elsewhere, direct access to webroot, we redirect to main
Help page
-var userLang = navigator.language;
-if(userLang === undefined ){
-userlang="en-US";
-}
-window.open(userLang +
'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self');
+if (n != -1) {
+// the URL came from LibreOffice help (F1)
+var target = getParameterByName("Target",url);
+var version = getParameterByName("Version",url);
+var lang = getParameterByName("Language",url);
+var system = getParameterByName("System",url);
+var module;
+var defaultFile;
+var smodule = target.substr(0, target.indexOf('/'));
+switch (smodule) {
+case "swriter":
{defaultFile='text/swriter/main.html';module="WRITER";break;}
+case "scalc":
{defaultFile='text/sc
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca15cd081c9f875f0735f4bad2eaef366b5d43a5 Author: Jan Holesovsky AuthorDate: Fri Aug 10 21:08:47 2018 +0200 Commit: Gerrit Code Review CommitDate: Sun Aug 12 15:45:51 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Use window.location.href = ...; instead of window.open(..., '_self'); Otherwise the interim URLs end up in the history. Change-Id: If99aa1a29126f93387d2f5a6460cc0d43b488cd9 Reviewed-on: https://gerrit.libreoffice.org/58867 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5c1d1eb33951..7ab3eded419b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5c1d1eb33951982ffa5352980d4713489c0d98ae +Subproject commit 7ab3eded419b6fddbdd9d7a7c1f676b3720950c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
Hi,
On Sun, Aug 12, 2018 at 12:09:42PM +0300, Maxim Monastirsky wrote:
> On Sun, 2018-08-12 at 09:52 +0200, Rene Engelhard wrote:
> > > I think you should use colibre *instead* of tango. My understanding
> > > is
> >
> > No, that looks too much Windows'ishy to me.
>
> Ah, OK. In this case it might make sense to do an upstream patch to
> copy these icons to tango, as we already did for a lot of other icons
> that were copied to tango from galaxy (see tdf#118123).
>
> > > that colibre is at least as complete as tango, and is actively
> > > maintained unlike tango. And tango isn't even part of the fallback
> >
> > That is not 100% true, see my paste.
> >
> > For the desktop detection icon detection it is.
>
> The desktop detection code you cited is about defining the *preferred*
> icon theme, not about "fallback" - which means what to do when the
> requested theme isn't found. The fallback for a complete icon theme (as
> opposed to an individual icon) is done like this:
>
> /*static*/ OUString
> IconThemeSelector::ReturnFallback(const std::vector&
$ git grep ReturnFallback
source/app/IconThemeSelector.cxx:return ReturnFallback(installedThemes);
source/app/IconThemeSelector.cxx:return ReturnFallback(installedThemes);
source/app/IconThemeSelector.cxx:IconThemeSelector::ReturnFallback(const
std::vector& installedThemes)
so vcl/source/app/IconThemeSelector.cxx
> installedThemes)
> {
> if (!installedThemes.empty()) {
> return installedThemes.front().GetThemeId();
> }
> else {
> return FALLBACK_ICON_THEME_ID;
> }
> }
$ git grep FALLBACK_ICON_THEME_ID
qa/cppunit/app/test_IconThemeSelector.cxx:
OUString(vcl::IconThemeSelector::FALLBACK_ICON_THEME_ID), selected);
source/app/IconThemeSelector.cxx:/*static*/ const OUStringLiteral
IconThemeSelector::FALLBACK_ICON_THEME_ID("tango");
^
^
source/app/IconThemeSelector.cxx:r = FALLBACK_ICON_THEME_ID;
source/app/IconThemeSelector.cxx:return FALLBACK_ICON_THEME_ID;
So what is this then? Count me confused. :)
Regards,
Rene
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
Tango actually got the remaining ICP s, or should at least. I will check it
when back next Thursday.
On 12 August 2018 11:09:42 CEST, Maxim Monastirsky wrote:
>On Sun, 2018-08-12 at 09:52 +0200, Rene Engelhard wrote:
>> > I think you should use colibre *instead* of tango. My understanding
>> > is
>>
>> No, that looks too much Windows'ishy to me.
>
>Ah, OK. In this case it might make sense to do an upstream patch to
>copy these icons to tango, as we already did for a lot of other icons
>that were copied to tango from galaxy (see tdf#118123).
>
>> > that colibre is at least as complete as tango, and is actively
>> > maintained unlike tango. And tango isn't even part of the fallback
>>
>> That is not 100% true, see my paste.
>>
>> For the desktop detection icon detection it is.
>
>The desktop detection code you cited is about defining the *preferred*
>icon theme, not about "fallback" - which means what to do when the
>requested theme isn't found. The fallback for a complete icon theme (as
>opposed to an individual icon) is done like this:
>
>/*static*/ OUString
>IconThemeSelector::ReturnFallback(const std::vector&
>installedThemes)
>{
>if (!installedThemes.empty()) {
>return installedThemes.front().GetThemeId();
>}
>else {
>return FALLBACK_ICON_THEME_ID;
>}
>}
>
>... which means that it will return the first found theme, which might
>or might not be tango. Imagine a case of a user running gnome or kde
>(which have other defined themes in
>IconThemeSelector::GetIconThemeForDesktopEnvironment), while having
>only tango and colibre. It will get through the above code, and might
>pick colibre as well, which is not what you want.
>
>Maxim
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
On Sun, 2018-08-12 at 09:52 +0200, Rene Engelhard wrote:
> > I think you should use colibre *instead* of tango. My understanding
> > is
>
> No, that looks too much Windows'ishy to me.
Ah, OK. In this case it might make sense to do an upstream patch to
copy these icons to tango, as we already did for a lot of other icons
that were copied to tango from galaxy (see tdf#118123).
> > that colibre is at least as complete as tango, and is actively
> > maintained unlike tango. And tango isn't even part of the fallback
>
> That is not 100% true, see my paste.
>
> For the desktop detection icon detection it is.
The desktop detection code you cited is about defining the *preferred*
icon theme, not about "fallback" - which means what to do when the
requested theme isn't found. The fallback for a complete icon theme (as
opposed to an individual icon) is done like this:
/*static*/ OUString
IconThemeSelector::ReturnFallback(const std::vector&
installedThemes)
{
if (!installedThemes.empty()) {
return installedThemes.front().GetThemeId();
}
else {
return FALLBACK_ICON_THEME_ID;
}
}
... which means that it will return the first found theme, which might
or might not be tango. Imagine a case of a user running gnome or kde
(which have other defined themes in
IconThemeSelector::GetIconThemeForDesktopEnvironment), while having
only tango and colibre. It will get through the above code, and might
pick colibre as well, which is not what you want.
Maxim
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
On Sun, Aug 12, 2018 at 10:44:21AM +0300, Maxim Monastirsky wrote: > only karasa_jaga has these images, but it isn't part of the fallback > mechanism as you saw. ... and this one isn't packaged by me anyway. Didn't see a need and didn't want to have months of delay for approving the new package. (Any style has a extra package here.) Maybe I enable it for 6.2 given I need NEW anyway because of -qt5... Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
Hi, On Sun, Aug 12, 2018 at 10:44:21AM +0300, Maxim Monastirsky wrote: > On Sun, 2018-08-12 at 08:46 +0200, Rene Engelhard wrote: > > Will tango work there, > > No, as it doesn't have the radio/checkboxes images. Besides colibre, sigh, OK, so I did https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/3c1aee743e2de32b636ce906145ce588d9f285af > only karasa_jaga has these images, but it isn't part of the fallback > mechanism as you saw. > > > or do I really need to add a extra > > Depends: on colibre? > I think you should use colibre *instead* of tango. My understanding is No, that looks too much Windows'ishy to me. > that colibre is at least as complete as tango, and is actively > maintained unlike tango. And tango isn't even part of the fallback That is not 100% true, see my paste. For the desktop detection icon detection it is. For the "other" fallback you are right... Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabvwsha.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d19482e191b8839f3b552e3b6e5e91ead70d565f Author: Mike Kaganski AuthorDate: Sun Aug 12 08:31:25 2018 +0200 Commit: Mike Kaganski CommitDate: Sun Aug 12 09:45:04 2018 +0200 Use o3tl::temporary Change-Id: Ifbe8de75aaeab9403b8e6366ecd927851c32 Reviewed-on: https://gerrit.libreoffice.org/58894 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index be358a073f3b..7ae6f759b2cb 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -685,8 +686,7 @@ void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bSt // unintentionally interpreted as a number, and to show the // user that it is a string (#35060#). //! also for numberformat "Text"? -> then remove when editing -double fDummy; -if ( pFormatter->IsNumberFormat(aString, nNumFmt, fDummy) ) +if ( pFormatter->IsNumberFormat(aString, nNumFmt, o3tl::temporary(double())) ) aString = "'" + aString; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
On Sun, 2018-08-12 at 08:46 +0200, Rene Engelhard wrote: > Will tango work there, No, as it doesn't have the radio/checkboxes images. Besides colibre, only karasa_jaga has these images, but it isn't part of the fallback mechanism as you saw. > or do I really need to add a extra > Depends: on colibre? I think you should use colibre *instead* of tango. My understanding is that colibre is at least as complete as tango, and is actively maintained unlike tango. And tango isn't even part of the fallback mechanism currently, so depending on it is pointless (unless we change the fallback list again). Maxim ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabvwsha.cxx | 57 - 1 file changed, 28 insertions(+), 29 deletions(-) New commits: commit 0a635939d992369c06f5aef98c1627de7098f156 Author: Mike Kaganski AuthorDate: Sun Aug 12 08:28:52 2018 +0200 Commit: Mike Kaganski CommitDate: Sun Aug 12 09:28:25 2018 +0200 Sort includes Change-Id: Ied47f42098eb7975340ba82406fefbeb0533d704 Reviewed-on: https://gerrit.libreoffice.org/58893 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 985c229a4a78..be358a073f3b 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -17,56 +17,55 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#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 - using namespace com::sun::star; bool ScTabViewShell::GetFunction( OUString& rFuncStr, FormulaError nErrCode ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: broken radio/checkboxes in LibreOffice 6.1 (was: Re: UI regressions in "gen" plugin with LibreOffice 6.1)
On Sun, Aug 12, 2018 at 08:56:23AM +0200, Heiko Tietze wrote: >Fallback was reworked. And Tango should also be complete in 6.1 after >copying the remaining icons from Galaxy So we should update the second case also to tango? Build with that change for testing just running. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
