[Libreoffice-commits] core.git: dbaccess/source solenv/bin svx/source sw/source udkapi/com unotest/source writerfilter/source
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx |2 +-
solenv/bin/modules/installer.pm|2 +-
svx/source/sdr/properties/groupproperties.cxx |2 +-
sw/source/filter/ww8/ww8par6.cxx |4 ++--
udkapi/com/sun/star/util/XMacroExpander.idl|2 +-
unotest/source/python/org/libreoffice/unotest.py |2 +-
writerfilter/source/dmapper/GraphicImport.cxx |2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 40cb28a7d564653e90cb1377e98c0c6f7a0eff6b
Author: Andrea Gelmini
Date: Sun Apr 1 01:03:58 2018 +0200
Fix typos
Change-Id: I981cfdf97d132afdd4d3729ec76b6a3f4c62909a
Reviewed-on: https://gerrit.libreoffice.org/52210
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 8c4a56d41348..741c36adebf6 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -248,7 +248,7 @@ bool ORelationTableConnectionData::Update()
return false;
}
-// reassign the keys because the orientaion could be changed
+// reassign the keys because the orientation could be changed
Reference xTableProp(getReferencingTable()->getTable());
Reference< XIndexAccess> xKeys ( getReferencingTable()->getKeys());
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index b11e55b09077..fff1d90155d9 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -654,7 +654,7 @@ sub run {
# 1. Looking for all destination paths in the files array
# 2. Looking for directories with CREATE flag in the directory array
# Advantage: Many paths are hidden in zip files, they are not defined
in the setup script.
-# It will be possible, that in the setup script only those directoies
have to be defined,
+# It will be possible, that in the setup script only those directories
have to be defined,
# that have a CREATE flag. All other directories are created, if they
contain at least one file.
my ($directoriesforepmarrayref, $alldirectoryhash) =
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref,
$unixlinksinproductlanguageresolvedarrayref);
diff --git a/svx/source/sdr/properties/groupproperties.cxx
b/svx/source/sdr/properties/groupproperties.cxx
index 857eea1fed73..39130e8b5326 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -107,7 +107,7 @@ namespace sdr
}
}
-// For group proerties, do not call parent since groups do
+// For group properties, do not call parent since groups do
// not have local ItemSets.
return *mpItemSet;
}
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 353e0226dad5..7431cd52e110 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1792,7 +1792,7 @@ bToggelPos(false)
eSurround = css::text::WrapTextMode_PARALLEL;
/*
- #95905#, #83307# seems to have gone away now, so reenable parallel
+ #95905#, #83307# seems to have gone away now, so re-enable parallel
wrapping support for frames in headers/footers. I don't know if we truly
have an explicitly specified behaviour for these circumstances.
*/
@@ -2242,7 +2242,7 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrameFormat
*pFlyFormat,
aSize.SetHeight(MINLAY);
pFlyFormat->SetFormatAttr(aSize);
SwFormatHoriOrient aHori =
pTableFormat->GetHoriOrient();
-// passing the table orientaion of
+// passing the table orientation of
// LEFT_AND_WIDTH to the frame seems to
// work better than FULL, especially if the
// table width exceeds the page width, however
diff --git a/udkapi/com/sun/star/util/XMacroExpander.idl
b/udkapi/com/sun/star/util/XMacroExpander.idl
index a52fd449fb7c..3fdc598981f5 100644
--- a/udkapi/com/sun/star/util/XMacroExpander.idl
+++ b/udkapi/com/sun/star/util/XMacroExpander.idl
@@ -27,7 +27,7 @@
module com { module sun { module star { module util {
-/** Expands macro in expressions, i.e. substitudes macro names.
+/** Expands macro in expressions, i.e. substitutes macro names.
@since OOo 1.1.2
*/
diff --git a/unotest/source/python/org/libreoffice/unotest.py
b/unotest/source/python/org/libreoffice/unotest.py
index 222389af9e05..000a148b353f 100644
--- a/unote
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/inc/hsqldb/HTable.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 00685f14577d3d25881b48458a15f1485a9ae7f6
Author: Andrea Gelmini
Date: Thu Apr 12 17:59:34 2018 +0200
Fix typos
Change-Id: Ia9b7550d7abc703fb94d2ff5e84a6bf3d39074ec
Reviewed-on: https://gerrit.libreoffice.org/52789
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx
b/connectivity/source/inc/hsqldb/HTable.hxx
index b479039cc7b0..dc1dc10bc95d 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -36,7 +36,7 @@ namespace connectivity
{
sal_Int32 m_nPrivileges; // we have to set our privileges by our
own
-/** executes the statmenmt.
+/** executes the statement.
@param _rStatement
The statement to execute.
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: linguistic/source lotuswordpro/source scaddins/idl shell/inc shell/source smoketest/data ucb/source
linguistic/source/gciterator.hxx |2 +-
lotuswordpro/source/filter/xfilter/xfutil.cxx |2 +-
scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl|2 +-
shell/inc/iso8601_converter.hxx|6 +++---
shell/source/win32/shlxthandler/util/iso8601_converter.cxx |4 ++--
smoketest/data/Basic/Standard/Test_DB.xml |2 +-
ucb/source/cacher/cachedcontentresultset.cxx |4 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit cc7ff0c141e27090ab521073b961b5eeeb4d693e
Author: Andrea Gelmini
Date: Tue Apr 3 00:27:19 2018 +0200
Fix typos
Change-Id: I28d9591517c324e995691139582c77b5cfdc9d77
Reviewed-on: https://gerrit.libreoffice.org/52211
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 0d7a1855f37f..568a30f50150 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -57,7 +57,7 @@ struct FPEntry
// the starting position to be checked
sal_Int32 m_nStartIndex;
-// the flag to identify whether the document does automatical grammar
checking
+// the flag to identify whether the document does automatic grammar
checking
boolm_bAutomatic;
FPEntry()
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx
b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index c54662283644..c365bf5e1dec 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -146,7 +146,7 @@ OUString GetUnderlineName(enumXFUnderline type)
return OUString("double-wave");
break;
case enumXFUnderlineSmallWave:
-return OUString("samll-wave");
+return OUString("small-wave");
break;
}
return OUString();
diff --git a/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl
b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl
index 995430c69fce..24142964efb8 100644
--- a/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl
+++ b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl
@@ -400,7 +400,7 @@ module addin
double getDuration(
[in] com::sun::star::beans::XPropertySet xOptions,
[in] long Settlement, [in] long Maturity, [in] double
Coupon, [in] double Yield,
-[in] long Frequncy, [in] any Base )
+[in] long Frequency, [in] any Base )
raises( com::sun::star::lang::IllegalArgumentException );
/// effect.
diff --git a/shell/inc/iso8601_converter.hxx b/shell/inc/iso8601_converter.hxx
index 570cecbef4e5..a8a0b4ed2ae2 100644
--- a/shell/inc/iso8601_converter.hxx
+++ b/shell/inc/iso8601_converter.hxx
@@ -23,15 +23,15 @@
#include
-/* Converts ISO 8601 conform date/time
- represenation to the representation
+/* Converts ISO 8601 compliant date/time
+ representation to the representation
conforming to the current locale,
ignoring the milliseconds part if exists
*/
std::wstring iso8601_date_to_local_date(const std::wstring& iso8601date);
-/* Converts ISO 8601 conform duration
+/* Converts ISO 8601 compliant duration
representation to the representation
conforming to the current locale
*/
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index c55d9513b67c..331a76926a5f 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -29,8 +29,8 @@
#include
-/* Converts ISO 8601 conform date/time
- represenation to the representation
+/* Converts ISO 8601 compliant date/time
+ representation to the representation
conforming to the current locale
*/
std::wstring iso8601_date_to_local_date(const std::wstring& isoDate )
diff --git a/smoketest/data/Basic/Standard/Test_DB.xml
b/smoketest/data/Basic/Standard/Test_DB.xml
index 4572f3d337e9..d3452d141d27 100644
--- a/smoketest/data/Basic/Standard/Test_DB.xml
+++ b/smoketest/data/Basic/Standard/Test_DB.xml
@@ -32,7 +32,7 @@ Sub TestDB
Dim sDBName as String, sTable as String, sCurrentMessage as String
Dim nRowCount as Integer
Dim bResult as Boolean
-Const sTestString = "Automatical Test"
+Const sTestString = "Automatic Test"
On Local Error GoTo DBERROR
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index c7444b5d8f45..bf343123616c 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -1659,7 +1659,7 @@ sal_Bool SAL_CALL CachedContentResultSet
}
aGuard.clear();
-//find out whethter the original resultset contains rows or not
+//find out whether the original resultset contains rows or not
m_xRes
[Libreoffice-commits] core.git: desktop/source sfx2/source sw/qa
desktop/source/app/app.cxx |2 +-
sfx2/source/appl/openuriexternally.cxx |2 +-
sw/qa/extras/odfexport/odfexport.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5203027d74c73f865c53d0be488757ce150130d0
Author: Andrea Gelmini
Date: Thu Apr 12 21:12:32 2018 +0200
Fix typos
Change-Id: I9ea95f5b7b6cd056cc1aad146c8841877d187d55
Reviewed-on: https://gerrit.libreoffice.org/52742
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c238d53529d8..e452529fbac3 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2243,7 +2243,7 @@ OUString GetURL_Impl(
const OUString& rName, boost::optional< OUString > const & cwdUrl )
{
// if rName is a vnd.sun.star.script URL do not attempt to parse it
-// as INetURLObj does not handle handle there URLs
+// as INetURLObj does not handle URLs there
if (rName.startsWith("vnd.sun.star.script"))
{
return rName;
diff --git a/sfx2/source/appl/openuriexternally.cxx
b/sfx2/source/appl/openuriexternally.cxx
index bff5534495d6..5d1b13df8234 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -65,7 +65,7 @@ void URITools::openURI(const OUString& sURI, bool
bHandleSystemShellExecuteExcep
// tdf#116305 Workaround: Use timer to bring browsers to the front
aOpenURITimer.SetInvokeHandler(LINK(this, URITools, onOpenURI));
#ifdef WNT
-// 200ms seems to be the the best compromise between responsiveness and
success rate
+// 200ms seems to be the best compromise between responsiveness and
success rate
aOpenURITimer.SetTimeout(200);
#else
aOpenURITimer.SetTimeout(0);
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 219ef5bd8b07..6872be59ebab 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -208,7 +208,7 @@ void testTdf43569_CheckIfFieldParse()
// Input document contains only one IF-field,
// and it should be imported as com.sun.star.text.TextField.ConditionalText in
any case,
-// instead of insertion of the the pair of two field-marks:
+ .
+// instead of insertion of the pair of two field-marks:
+ .
DECLARE_ODFEXPORT_TEST(testTdf43569, "tdf43569_conditionalfield.doc")
{
// check if our parser is valid
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 23fd3c4020617e7d4954863292180fddf6594327
Author: Andrea Gelmini
Date: Fri Apr 13 09:23:46 2018 +0200
Fix typo
Change-Id: I92942f8882ef0d3a387dc29d1c98b7db5b89cd4d
Reviewed-on: https://gerrit.libreoffice.org/52809
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 9e7d943d3e37..2fa19d54e65d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -354,7 +354,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf112118_DOCX,
"tdf112118.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf116976, "tdf116976.docx")
{
-// This was 0, reltive size of shape after bitmap was ignored.
+// This was 0, relative size of shape after bitmap was ignored.
CPPUNIT_ASSERT_EQUAL(static_cast(40),
getProperty(getShape(1), "RelativeWidth"));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
On Tue, Apr 10, 2018 at 01:32:59PM +0200, Eike Rathke wrote: > Hi Khaled, > > On Thursday, 2018-04-05 16:22:26 +, Khaled Hosny wrote: > > > There are two proposals for the project I want to mentor, but none of them > > submitted any patches so far, so I'm not sure if we want any of these or > > not. > > It's too late now because GSoC slot requests should had happened > already, but we require the student to submit (not too trivial) working > patches because it shows that s/he is able to build/debug/modify the > source code. A student should also follow our documented (in the > wiki) timeline and requirements or at least ask questions if things need > to be clarified, and in general be in contact with the project. Unless > you are confident for other reasons that the student will be the right > person to implement a GSoC proposal there's no indication that such > proposal would lead to a successful GSoC project. I see. Well, based on this I don’t think I should be mentoring that student. Is it too late for that? Regards, Khaled signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.LokDialog.js |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit ac3261b1fa6601329c8f86e164cae08c8f149010
Author: Henry Castro
Date: Fri Apr 13 20:27:34 2018 -0400
loleaflet: fix lint error, no-redeclare
Change-Id: If367b19cf0c1d382a417cf85748d5275389af2ec
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index a3d255af5..5766458c8 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -88,6 +88,7 @@ L.Control.LokDialog = L.Control.extend({
_onDialogMsg: function(e) {
e.id = parseInt(e.id);
+ var left, top;
var strDlgId = this._toDlgPrefix(e.id);
if (e.action === 'created') {
@@ -95,8 +96,8 @@ L.Control.LokDialog = L.Control.extend({
var height = parseInt(e.size.split(',')[1]);
if (e.winType === 'dialog') {
- var left = (e.position != null)?
parseInt(e.position.split(',')[0]): null;
- var top = (e.position != null)?
parseInt(e.position.split(',')[1]): null;
+ left = (e.position != null)?
parseInt(e.position.split(',')[0]): null;
+ top = (e.position != null)?
parseInt(e.position.split(',')[1]): null;
this._launchDialog(this._toDlgPrefix(e.id),
left, top, width, height, e.title);
this._sendPaintWindow(e.id,
this._createRectStr(e.id));
@@ -105,8 +106,8 @@ L.Control.LokDialog = L.Control.extend({
return;
var parentId = parseInt(e.parentId);
- var left = parseInt(e.position.split(',')[0]);
- var top = parseInt(e.position.split(',')[1]);
+ left = parseInt(e.position.split(',')[0]);
+ top = parseInt(e.position.split(',')[1]);
this._removeDialogChild(parentId);
this._dialogs[parentId].childid = e.id;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source vcl/unx
include/vcl/mnemonic.hxx |5 -
vcl/source/window/mnemonic.cxx | 13 +-
vcl/unx/gtk3/gtk3gtkinst.cxx | 184 -
3 files changed, 139 insertions(+), 63 deletions(-)
New commits:
commit 9c8a6a4396ebbe8ecb15591cc291c388c82c8ed6
Author: Caolán McNamara
Date: Fri Apr 13 15:31:44 2018 +0100
gtk3: generate missing mnemonics
Change-Id: Ib0e94b8484dabb7e859c53aeb0e4adf75727fcd6
Reviewed-on: https://gerrit.libreoffice.org/52839
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index bf2591aff8f4..f7db3a3095fb 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -51,15 +51,16 @@
class VCL_DLLPUBLIC MnemonicGenerator
{
+sal_Unicode m_cMnemonic;
// 0 == Mnemonic; >0 == count of characters
sal_uInt8 maMnemonics[MAX_MNEMONICS];
css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass;
SAL_DLLPRIVATE static sal_uInt16 ImplGetMnemonicIndex( sal_Unicode c );
-SAL_DLLPRIVATE static sal_Unicode ImplFindMnemonic( const OUString& rKey );
+SAL_DLLPRIVATE sal_Unicode ImplFindMnemonic( const OUString& rKey );
public:
-MnemonicGenerator();
+MnemonicGenerator(sal_Unicode cMnemonic =
MNEMONIC_CHAR);
voidRegisterMnemonic( const OUString& rKey );
OUStringCreateMnemonic( const OUString& rKey );
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index fe26cd14c152..43db6dea1493 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -28,7 +28,8 @@
using namespace ::com::sun::star;
-MnemonicGenerator::MnemonicGenerator()
+MnemonicGenerator::MnemonicGenerator(sal_Unicode cMnemonic)
+: m_cMnemonic(cMnemonic)
{
memset( maMnemonics, 1, sizeof( maMnemonics ) );
}
@@ -59,10 +60,10 @@ sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex(
sal_Unicode c )
sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey )
{
sal_Int32 nIndex = 0;
-while ( (nIndex = rKey.indexOf( MNEMONIC_CHAR, nIndex )) != -1 )
+while ( (nIndex = rKey.indexOf( m_cMnemonic, nIndex )) != -1 )
{
sal_Unicode cMnemonic = rKey[ nIndex+1 ];
-if ( cMnemonic != MNEMONIC_CHAR )
+if ( cMnemonic != m_cMnemonic )
return cMnemonic;
nIndex += 2;
}
@@ -187,7 +188,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString&
_rKey )
if ( maMnemonics[nMnemonicIndex] )
{
maMnemonics[nMnemonicIndex] = 0;
-rKey = rKey.replaceAt( nIndex, 0, OUString(MNEMONIC_CHAR)
);
+rKey = rKey.replaceAt( nIndex, 0, OUString(m_cMnemonic) );
bChanged = true;
break;
}
@@ -239,7 +240,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString&
_rKey )
if ( nBestCount != 0x )
{
maMnemonics[nBestMnemonicIndex] = 0;
-rKey = rKey.replaceAt( nBestIndex, 0, OUString(MNEMONIC_CHAR)
);
+rKey = rKey.replaceAt( nBestIndex, 0, OUString(m_cMnemonic) );
bChanged = true;
}
}
@@ -260,7 +261,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString&
_rKey )
{
maMnemonics[nMnemonicIndex] = 0;
OUString aStr = OUStringBuffer().
-
append('(').append(MNEMONIC_CHAR).append(sal_Unicode(rtl::toAsciiUpperCase(c))).
+
append('(').append(m_cMnemonic).append(sal_Unicode(rtl::toAsciiUpperCase(c))).
append(')').makeStringAndClear();
nIndex = rKey.getLength();
if( nIndex >= 2 )
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 957b58fcc083..9425d93fa63e 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
@@ -2343,6 +2344,31 @@ public:
}
};
+namespace
+{
+OUString get_label(GtkLabel* pLabel)
+{
+const gchar* pStr = gtk_label_get_label(pLabel);
+return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
+}
+
+void set_label(GtkLabel* pLabel, const OUString& rText)
+{
+gtk_label_set_label(pLabel, MapToGtkAccelerator(rText).getStr());
+}
+
+OUString get_label(GtkButton* pButton)
+{
+const gchar* pStr = gtk_button_get_label(pButton);
+return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
+}
+
+void set_label(GtkButton* pButton, const OUString& rText)
+{
+gtk_button_set_label(pButton, MapToGtkAccelerator(rText).getStr());
+}
[Libreoffice-commits] core.git: icon-themes/colibre
icon-themes/colibre/svx/res/frmsel1.png |binary icon-themes/colibre/svx/res/frmsel10.png |binary icon-themes/colibre/svx/res/frmsel11.png |binary icon-themes/colibre/svx/res/frmsel12.png |binary icon-themes/colibre/svx/res/frmsel13.png |binary icon-themes/colibre/svx/res/frmsel14.png |binary icon-themes/colibre/svx/res/frmsel15.png |binary icon-themes/colibre/svx/res/frmsel16.png |binary icon-themes/colibre/svx/res/frmsel2.png |binary icon-themes/colibre/svx/res/frmsel3.png |binary icon-themes/colibre/svx/res/frmsel4.png |binary icon-themes/colibre/svx/res/frmsel5.png |binary icon-themes/colibre/svx/res/frmsel6.png |binary icon-themes/colibre/svx/res/frmsel7.png |binary icon-themes/colibre/svx/res/frmsel8.png |binary icon-themes/colibre/svx/res/frmsel9.png |binary icon-themes/colibre/svx/res/rectbtns.png |binary 17 files changed New commits: commit 22d2dbeaa6667e4c66978fb3bad11f835f569ef0 Author: andreas kainz Date: Sat Apr 14 00:43:38 2018 +0200 Colibre icons: add missing svx icons Change-Id: I2c20351e749f84a1d9f80fbf4e8adb68b0c065be Reviewed-on: https://gerrit.libreoffice.org/52862 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/icon-themes/colibre/svx/res/frmsel1.png b/icon-themes/colibre/svx/res/frmsel1.png new file mode 100644 index ..ba7a23ea9ce4 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel1.png differ diff --git a/icon-themes/colibre/svx/res/frmsel10.png b/icon-themes/colibre/svx/res/frmsel10.png new file mode 100644 index ..6746c41708bf Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel10.png differ diff --git a/icon-themes/colibre/svx/res/frmsel11.png b/icon-themes/colibre/svx/res/frmsel11.png new file mode 100644 index ..c766d0f2e5cc Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel11.png differ diff --git a/icon-themes/colibre/svx/res/frmsel12.png b/icon-themes/colibre/svx/res/frmsel12.png new file mode 100644 index ..99cb87835f95 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel12.png differ diff --git a/icon-themes/colibre/svx/res/frmsel13.png b/icon-themes/colibre/svx/res/frmsel13.png new file mode 100644 index ..c4e954b4bc47 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel13.png differ diff --git a/icon-themes/colibre/svx/res/frmsel14.png b/icon-themes/colibre/svx/res/frmsel14.png new file mode 100644 index ..d9a0acc46332 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel14.png differ diff --git a/icon-themes/colibre/svx/res/frmsel15.png b/icon-themes/colibre/svx/res/frmsel15.png new file mode 100644 index ..6f575ce5afc6 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel15.png differ diff --git a/icon-themes/colibre/svx/res/frmsel16.png b/icon-themes/colibre/svx/res/frmsel16.png new file mode 100644 index ..0ca35d6daebf Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel16.png differ diff --git a/icon-themes/colibre/svx/res/frmsel2.png b/icon-themes/colibre/svx/res/frmsel2.png new file mode 100644 index ..87c0ae00ecb1 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel2.png differ diff --git a/icon-themes/colibre/svx/res/frmsel3.png b/icon-themes/colibre/svx/res/frmsel3.png new file mode 100644 index ..b57d53a1bbe6 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel3.png differ diff --git a/icon-themes/colibre/svx/res/frmsel4.png b/icon-themes/colibre/svx/res/frmsel4.png new file mode 100644 index ..c72002e00a81 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel4.png differ diff --git a/icon-themes/colibre/svx/res/frmsel5.png b/icon-themes/colibre/svx/res/frmsel5.png new file mode 100644 index ..0fd6d86c5deb Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel5.png differ diff --git a/icon-themes/colibre/svx/res/frmsel6.png b/icon-themes/colibre/svx/res/frmsel6.png new file mode 100644 index ..ddc7baaee317 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel6.png differ diff --git a/icon-themes/colibre/svx/res/frmsel7.png b/icon-themes/colibre/svx/res/frmsel7.png new file mode 100644 index ..9a1e4aa20c16 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel7.png differ diff --git a/icon-themes/colibre/svx/res/frmsel8.png b/icon-themes/colibre/svx/res/frmsel8.png new file mode 100644 index ..f8b1ef55dab9 Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel8.png differ diff --git a/icon-themes/colibre/svx/res/frmsel9.png b/icon-themes/colibre/svx/res/frmsel9.png new file mode 100644 index ..ccd02f3e077f Binary files /dev/null and b/icon-themes/colibre/svx/res/frmsel9.png differ diff --git a/icon-themes/colibre/svx/res/rectbtns.png b/icon-themes/colibre/svx/res/rectbtns.png new file mode 100644 index ..3e71adb25a
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/inserthyperlink.png |binary icon-themes/colibre/cmd/32/removehyperlink.png |binary icon-themes/colibre/cmd/adddirect.png|binary icon-themes/colibre/cmd/insertreferencefield.png |binary icon-themes/colibre/cmd/sendmail.png |binary icon-themes/colibre/res/hldocntp.png |binary icon-themes/colibre/res/hldoctp.png |binary icon-themes/colibre/res/hlinettp.png |binary icon-themes/colibre/res/hlmailtp.png |binary icon-themes/colibre_svg/cmd/32/inserthyperlink.svg |1 + icon-themes/colibre_svg/cmd/32/removehyperlink.svg |1 + icon-themes/colibre_svg/cmd/adddirect.svg|1 + icon-themes/colibre_svg/cmd/insertreferencefield.svg |1 + icon-themes/colibre_svg/cmd/sendmail.svg |1 + icon-themes/colibre_svg/res/hldocntp.svg |1 + icon-themes/colibre_svg/res/hldoctp.svg |2 +- icon-themes/colibre_svg/res/hlinettp.svg |6 +- icon-themes/colibre_svg/res/hlmailtp.svg |2 +- 18 files changed, 9 insertions(+), 7 deletions(-) New commits: commit 895f0c47d43c7df2aadddcb8f53c0193874c866c Author: andreas kainz Date: Sat Apr 14 00:37:19 2018 +0200 Colibre icons: 32px icons for hyperlink dialog Change-Id: Ic53436c7b717ddca1b12e8f94ccc44e53cf89a8d Reviewed-on: https://gerrit.libreoffice.org/52861 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/32/inserthyperlink.png b/icon-themes/colibre/cmd/32/inserthyperlink.png new file mode 100644 index ..c0eb852b6611 Binary files /dev/null and b/icon-themes/colibre/cmd/32/inserthyperlink.png differ diff --git a/icon-themes/colibre/cmd/32/removehyperlink.png b/icon-themes/colibre/cmd/32/removehyperlink.png new file mode 100644 index ..ec5a7879de09 Binary files /dev/null and b/icon-themes/colibre/cmd/32/removehyperlink.png differ diff --git a/icon-themes/colibre/cmd/adddirect.png b/icon-themes/colibre/cmd/adddirect.png new file mode 100644 index ..9acbb05c960f Binary files /dev/null and b/icon-themes/colibre/cmd/adddirect.png differ diff --git a/icon-themes/colibre/cmd/insertreferencefield.png b/icon-themes/colibre/cmd/insertreferencefield.png new file mode 100644 index ..0ce40266c432 Binary files /dev/null and b/icon-themes/colibre/cmd/insertreferencefield.png differ diff --git a/icon-themes/colibre/cmd/sendmail.png b/icon-themes/colibre/cmd/sendmail.png new file mode 100644 index ..dd6b4bba3ccd Binary files /dev/null and b/icon-themes/colibre/cmd/sendmail.png differ diff --git a/icon-themes/colibre/res/hldocntp.png b/icon-themes/colibre/res/hldocntp.png new file mode 100644 index ..9acbb05c960f Binary files /dev/null and b/icon-themes/colibre/res/hldocntp.png differ diff --git a/icon-themes/colibre/res/hldoctp.png b/icon-themes/colibre/res/hldoctp.png index c082964a25d5..0ce40266c432 100644 Binary files a/icon-themes/colibre/res/hldoctp.png and b/icon-themes/colibre/res/hldoctp.png differ diff --git a/icon-themes/colibre/res/hlinettp.png b/icon-themes/colibre/res/hlinettp.png index 02f80a374376..c0eb852b6611 100644 Binary files a/icon-themes/colibre/res/hlinettp.png and b/icon-themes/colibre/res/hlinettp.png differ diff --git a/icon-themes/colibre/res/hlmailtp.png b/icon-themes/colibre/res/hlmailtp.png index 57f675740a6f..dd6b4bba3ccd 100644 Binary files a/icon-themes/colibre/res/hlmailtp.png and b/icon-themes/colibre/res/hlmailtp.png differ diff --git a/icon-themes/colibre_svg/cmd/32/inserthyperlink.svg b/icon-themes/colibre_svg/cmd/32/inserthyperlink.svg new file mode 100644 index ..616853f07161 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/inserthyperlink.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/removehyperlink.svg b/icon-themes/colibre_svg/cmd/32/removehyperlink.svg new file mode 100644 index ..1cc18b35f812 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/removehyperlink.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/adddirect.svg b/icon-themes/colibre_svg/cmd/adddirect.svg new file mode 100644 index ..f819bb805319 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/adddirect.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/insertreferencefield.svg b/icon-themes/colibre_svg/cmd/insertreferencefield.svg new file mode 100644 index ..1045d4e6f450 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/insertreferencefield.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sendmail.svg b/icon-themes/colibre_svg/cmd/sendmail.svg new file mode 100644
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg sw/uiconfig
icon-themes/colibre/cmd/sc_toolbarmode.png |binary icon-themes/colibre_svg/cmd/sc_toolbarmode.svg |8 sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml |1 + 3 files changed, 9 insertions(+) New commits: commit d8aa75effa66480b6beb0db0258878b698981ddc Author: andreas kainz Date: Fri Apr 13 23:48:51 2018 +0200 NB writer: add ToolbarMode to have a switch action available Change-Id: I0277bbbd0fd77a93285e6e56421677553431286b Reviewed-on: https://gerrit.libreoffice.org/52858 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/sc_toolbarmode.png b/icon-themes/colibre/cmd/sc_toolbarmode.png new file mode 100644 index ..e36aa44e957f Binary files /dev/null and b/icon-themes/colibre/cmd/sc_toolbarmode.png differ diff --git a/icon-themes/colibre_svg/cmd/sc_toolbarmode.svg b/icon-themes/colibre_svg/cmd/sc_toolbarmode.svg new file mode 100644 index ..8f948ef7c839 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/sc_toolbarmode.svg @@ -0,0 +1,8 @@ +http://www.w3.org/2000/svg";> + + + + + + /> + \ No newline at end of file diff --git a/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml b/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml index 6a067ef567fd..cee4d56f1b68 100644 --- a/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml +++ b/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml @@ -12,4 +12,5 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/lint-ui.py chart2/uiconfig cui/uiconfig dbaccess/uiconfig desktop/uiconfig extensions/uiconfig filter/uiconfig formula/uiconfig fpicker/uiconfig reportdesign/uiconf
bin/lint-ui.py | 11 chart2/uiconfig/ui/dlg_InsertErrorBars.ui |1 chart2/uiconfig/ui/sidebaraxis.ui |2 + chart2/uiconfig/ui/sidebarelements.ui | 17 + chart2/uiconfig/ui/sidebarseries.ui|4 +++ chart2/uiconfig/ui/tp_ChartType.ui |1 chart2/uiconfig/ui/tp_ErrorBars.ui |1 chart2/uiconfig/ui/tp_RangeChooser.ui |1 cui/uiconfig/ui/asiantypography.ui |3 ++ cui/uiconfig/ui/bitmaptabpage.ui |1 cui/uiconfig/ui/borderpage.ui |2 + cui/uiconfig/ui/colorconfigwin.ui |9 ++ cui/uiconfig/ui/connpooloptions.ui |1 cui/uiconfig/ui/effectspage.ui |5 +++ cui/uiconfig/ui/hangulhanjaoptdialog.ui|2 + cui/uiconfig/ui/hatchpage.ui |1 cui/uiconfig/ui/insertfloatingframe.ui |2 + cui/uiconfig/ui/insertoleobject.ui |2 + cui/uiconfig/ui/numberingoptionspage.ui|1 cui/uiconfig/ui/optadvancedpage.ui |1 cui/uiconfig/ui/optbasicidepage.ui |6 cui/uiconfig/ui/optctlpage.ui |1 cui/uiconfig/ui/optemailpage.ui|1 cui/uiconfig/ui/optgeneralpage.ui |2 + cui/uiconfig/ui/optlanguagespage.ui|1 cui/uiconfig/ui/optuserpage.ui |2 + cui/uiconfig/ui/optviewpage.ui |2 + cui/uiconfig/ui/paraindentspacing.ui |1 cui/uiconfig/ui/password.ui|1 cui/uiconfig/ui/positionpage.ui|3 ++ cui/uiconfig/ui/signatureline.ui |2 + cui/uiconfig/ui/twolinespage.ui|1 cui/uiconfig/ui/zoomdialog.ui |1 dbaccess/uiconfig/ui/connectionpage.ui |1 dbaccess/uiconfig/ui/dbasepage.ui |1 dbaccess/uiconfig/ui/finalpagewizard.ui|1 dbaccess/uiconfig/ui/ldappage.ui |1 dbaccess/uiconfig/ui/mysqlnativepage.ui|1 dbaccess/uiconfig/ui/odbcpage.ui |1 desktop/uiconfig/ui/extensionmanager.ui|3 ++ extensions/uiconfig/sabpilot/ui/datasourcepage.ui |2 + extensions/uiconfig/sbibliography/ui/querydialog.ui|1 extensions/uiconfig/scanner/ui/sanedialog.ui |2 + filter/uiconfig/ui/xmlfiltertabpagetransformation.ui |1 formula/uiconfig/ui/formuladialog.ui |1 fpicker/uiconfig/ui/explorerfiledialog.ui |5 +++ reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui |1 sc/uiconfig/scalc/ui/checkwarningdialog.ui |1 sc/uiconfig/scalc/ui/databaroptions.ui |1 sc/uiconfig/scalc/ui/datastreams.ui|1 sc/uiconfig/scalc/ui/formulacalculationoptions.ui |1 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |6 sc/uiconfig/scalc/ui/printeroptions.ui |1 sc/uiconfig/scalc/ui/recalcquerydialog.ui |1 sc/uiconfig/scalc/ui/regressiondialog.ui |3 ++ sc/uiconfig/scalc/ui/scgeneralpage.ui |1 sc/uiconfig/scalc/ui/sharedwarningdialog.ui|1 sc/uiconfig/scalc/ui/sidebaralignment.ui |3 ++ sc/uiconfig/scalc/ui/sortoptionspage.ui|7 + sc/uiconfig/scalc/ui/textimportoptions.ui |1 sd/uiconfig/sdraw/ui/drawprinteroptions.ui |2 + sd/uiconfig/simpress/ui/customanimationeffecttab.ui|2 + sd/uiconfig/simpress/ui/impressprinteroptions.ui |3 ++ sd/uiconfig/simpress/ui/photoalbum.ui |4 +++ sd/uiconfig/simpress/ui/prntopts.ui|4 +++ sd/uiconfig/simpress/ui/publishingdialog.ui|2 + sd/uiconfig/simpress/ui/sidebarslidebackground.ui |2 + sd/uiconfig/simpress/ui/slidetransitionspanel.ui |2 + sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui |2 + sfx2/uiconfig/ui/checkin.ui|1 sfx2/uiconfig/ui/optprintpage.ui |1 sfx2/uiconfig/ui/templatedlg.ui|1 starmath/uiconfig/
[Libreoffice-commits] core.git: bin/lint-ui.py chart2/uiconfig cui/uiconfig dbaccess/uiconfig extensions/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig svtools/uiconfig svx/uiconfig sw/uiconfig uu
bin/lint-ui.py | 10 ++
chart2/uiconfig/ui/dlg_InsertErrorBars.ui|1
chart2/uiconfig/ui/sidebarerrorbar.ui|3 +
chart2/uiconfig/ui/sidebarseries.ui |2 +
chart2/uiconfig/ui/tp_ErrorBars.ui |1
chart2/uiconfig/ui/tp_SeriesToAxis.ui|2 +
cui/uiconfig/ui/colorpage.ui |2 +
cui/uiconfig/ui/insertfloatingframe.ui |5 +++
cui/uiconfig/ui/insertoleobject.ui |2 +
cui/uiconfig/ui/optfltrembedpage.ui |2 +
cui/uiconfig/ui/personalization_tab.ui |3 +
cui/uiconfig/ui/positionpage.ui |6 +++
cui/uiconfig/ui/zoomdialog.ui|8 +
dbaccess/uiconfig/ui/dbwizmysqlintropage.ui |3 +
dbaccess/uiconfig/ui/querypropertiesdialog.ui|2 +
dbaccess/uiconfig/ui/textpage.ui |2 +
extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui |1
extensions/uiconfig/sabpilot/ui/selecttypepage.ui|8 +
sc/uiconfig/scalc/ui/correlationdialog.ui|2 +
sc/uiconfig/scalc/ui/covariancedialog.ui |2 +
sc/uiconfig/scalc/ui/movingaveragedialog.ui |2 +
sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |5 +++
sc/uiconfig/scalc/ui/samplingdialog.ui |2 +
sc/uiconfig/scalc/ui/sidebaralignment.ui |3 +
sc/uiconfig/scalc/ui/textimportoptions.ui|2 +
sd/uiconfig/sdraw/ui/drawprinteroptions.ui |7
sd/uiconfig/simpress/ui/dockinganimation.ui |2 +
sd/uiconfig/simpress/ui/impressprinteroptions.ui |7
sd/uiconfig/simpress/ui/prntopts.ui |2 +
sd/uiconfig/simpress/ui/publishingdialog.ui |2 +
sd/uiconfig/simpress/ui/slidetransitionspanel.ui |2 +
sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui |2 +
starmath/uiconfig/smath/ui/printeroptions.ui |3 +
svtools/uiconfig/ui/graphicexport.ui |8 +
svx/uiconfig/ui/compressgraphicdialog.ui |2 +
sw/uiconfig/swriter/ui/bibliographyentry.ui |2 +
sw/uiconfig/swriter/ui/converttexttable.ui |4 ++
sw/uiconfig/swriter/ui/flddbpage.ui |2 +
sw/uiconfig/swriter/ui/footnotepage.ui |2 +
sw/uiconfig/swriter/ui/insertbreak.ui|4 ++
sw/uiconfig/swriter/ui/insertfootnote.ui |4 ++
sw/uiconfig/swriter/ui/insertscript.ui |2 +
sw/uiconfig/swriter/ui/mailmerge.ui |1
sw/uiconfig/swriter/ui/picturepage.ui|3 +
sw/uiconfig/swriter/ui/sidebarwrap.ui|6 +++
sw/uiconfig/swriter/ui/sortdialog.ui | 11 ++-
sw/uiconfig/swriter/ui/splittable.ui |4 ++
sw/uiconfig/swriter/ui/textgridpage.ui |3 +
sw/uiconfig/swriter/ui/titlepage.ui |4 ++
sw/uiconfig/swriter/ui/tocentriespage.ui |6 +++
sw/uiconfig/swriter/ui/tocindexpage.ui |2 +
uui/uiconfig/ui/unknownauthdialog.ui |1
vcl/qa/cppunit/builder/demo.ui | 17 ++-
vcl/uiconfig/ui/printdialog.ui |8 +
54 files changed, 202 insertions(+), 2 deletions(-)
New commits:
commit b31ed9dc1d3a8a93f924d10cd441cf756847cc5f
Author: Caolán McNamara
Date: Fri Apr 13 16:02:37 2018 +0100
look for radio buttons without underlines
Change-Id: I0ed97515a03a5633628a492ec7797fc3ade8a3d8
Reviewed-on: https://gerrit.libreoffice.org/52846
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index 34669c85690a..27447be36165 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -59,6 +59,14 @@ def check_message_box_spacing(element):
lint_assert(spacing.text == MESSAGE_BOX_SPACING,
"Button box 'spacing' should be " + MESSAGE_BOX_SPACING)
+def check_radio_buttons(root):
+radios = [element for element in root.findall('.//object') if
element.attrib['class'] == 'GtkRadioButton']
+for radio in radios:
+radio_underlines = radio.findall("./property[@name='use_underline']")
+assert len(radio_underlines) <= 1
+if len(radio_underlines) < 1:
+lint_assert(False,
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |3 --- 1 file changed, 3 deletions(-) New commits: commit 066ad8cfcdf570c0d14f3de379adfa6c3c196518 Author: andreas kainz Date: Fri Apr 13 14:33:28 2018 +0200 NB Implementation: reduce length of conditional formating Change-Id: Ie9ead1e9bb58701283b337014ba39846c1b75d61 Reviewed-on: https://gerrit.libreoffice.org/52828 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index a01b054f0144..cdbb1e420cc0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -488,9 +488,6 @@ - C~onditional Formatting - - C~onditional ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source svx/source unoxml/qa
framework/source/uielement/toolbarmanager.cxx |2 +-
svx/source/dialog/graphctl.cxx|2 +-
unoxml/qa/unit/domtest.cxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2176c7829d1d925c0beb4586e1620ea513302390
Author: Andrea Gelmini
Date: Sun Apr 1 16:57:11 2018 +0200
Fix typos
Change-Id: If4bc1698af2a43a2dbc45b8518c0f5b736d6abaf
Reviewed-on: https://gerrit.libreoffice.org/52278
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 5c54b2050af9..ea77c92a70a8 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -859,7 +859,7 @@ void ToolBarManager::CreateControllers()
}
}
-//for update Controller via support visiable state
+//for update Controller via support visible state
Reference< XPropertySet > xPropSet( xController, UNO_QUERY );
if ( xPropSet.is() )
{
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 07ff51e01fd9..568827f303f5 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -222,7 +222,7 @@ void GraphCtrl::Resize()
void GraphCtrl::Paint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
{
-// #i72889# used splitted repaint to be able to paint an own background
+// #i72889# used split repaint to be able to paint an own background
// even to the buffered view
const bool bGraphicValid(GraphicType::NONE != aGraphic.GetType());
diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx
index 234289e69454..b69fa81e4468 100644
--- a/unoxml/qa/unit/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -234,7 +234,7 @@ struct BasicTest : public test::BootstrapFixture
{
try
{
-// We DONT expect exception here, as mxWarningInStream is valid
XML Doc
+// We DON'T expect exception here, as mxWarningInStream is valid
XML Doc
CPPUNIT_ASSERT_MESSAGE("Valid input file did not result in
XDocument #2",
mxDomBuilder->parse(
uno::Reference(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Database migration in Base
sorry for the second post - but I should correct something I said. Just realized; about today's build not starting, user error! I downloaded the wrong daily build files ;- ( 32 but vs 64 bit), looks like I need to wait a bit longer for the 64 bit Linux build to finish. On Fri, Apr 13, 2018 at 3:49 PM, Drew Jensen wrote: > > On Thu, Apr 12, 2018 at 3:33 AM, Bunth Tamás wrote: > >> Hi Alex, >> >> On 10 April 2018 at 15:04, Alexander Thurgood >> wrote: >> > Le 10/04/2018 à 12:30, Tamas Bunth a écrit : >> > Read through your blog posts, sounds really promising, and I am >> > interested in testing with various hsqldb ODB files that I have accrued >> > over time through QAtriaging of Base problems. >> >> Thank you for that. >> > > Same here, I just finished reading all your blogs and the referenced TDF > pages; thanks for all that. > > Also took some to time to read over a number of the bugzilla items on the > work, along with the most recent ESC notes on the ML. > You've been busy ;-) > >> >> > Is there any particular setup required to test, other than building from >> > master ? >> > >> > Are any startup parameters required ? >> >> I build with --enable-firebird-sdbc flag, but I belive that it enabled >> by default. So no, that's all. >> >> I noted in one of the blogs this line: > "The migration can be enabled using DBACCESS_HSQL_MIGRATION=1 when starting > LibreOffice." > > So, I grabbed another copy of the daily build (13-apr-2018), little > problem with it (it won't start - but it's a daily build and I'll grab the > again tomorrow) > I'm hoping that with this that option to migrate will be there and, if so > I'll, will put to use for testing gong forward. > > Thanks again, > > Drew > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 70ebdb5919c21749a8422beff8c885bac38c5d77 Author: Andrea Gelmini Date: Fri Apr 13 19:19:35 2018 +0200 Removed duplicated include Change-Id: Ibfea1c4a87a719ba92111787fd74a6176f8b6458 Reviewed-on: https://gerrit.libreoffice.org/52850 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 552fd75a0beb..5ad4cdc22d5f 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Database migration in Base
On Thu, Apr 12, 2018 at 3:33 AM, Bunth Tamás wrote: > Hi Alex, > > On 10 April 2018 at 15:04, Alexander Thurgood > wrote: > > Le 10/04/2018 à 12:30, Tamas Bunth a écrit : > > Read through your blog posts, sounds really promising, and I am > > interested in testing with various hsqldb ODB files that I have accrued > > over time through QAtriaging of Base problems. > > Thank you for that. > Same here, I just finished reading all your blogs and the referenced TDF pages; thanks for all that. Also took some to time to read over a number of the bugzilla items on the work, along with the most recent ESC notes on the ML. You've been busy ;-) > > > Is there any particular setup required to test, other than building from > > master ? > > > > Are any startup parameters required ? > > I build with --enable-firebird-sdbc flag, but I belive that it enabled > by default. So no, that's all. > > I noted in one of the blogs this line: "The migration can be enabled using DBACCESS_HSQL_MIGRATION=1 when starting LibreOffice." So, I grabbed another copy of the daily build (13-apr-2018), little problem with it (it won't start - but it's a daily build and I'll grab the again tomorrow) I'm hoping that with this that option to migrate will be there and, if so I'll, will put to use for testing gong forward. Thanks again, Drew ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 378c1576d2890625ebbd18ec9ccff560eeb1619f Author: Mike Kaganski Date: Fri Apr 13 18:58:48 2018 +0100 LaunchConditions may be specific to install modes Those conditions that rely on AppSearch should only be checked when not yet installed, since AppSearch is not performed in maintenance modes Change-Id: Ie2c3fa8e8742a4c335f0cd8be571fa563a178a49 Reviewed-on: https://gerrit.libreoffice.org/52851 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index 2d72ac2d05c4..629c3c5582e1 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -2,5 +2,5 @@ Condition Description s255 l255 65001 LaunchCondition Condition Privileged OOO_LAUNCH_1 -VersionNT > WindowsMinVersionNumber Or (VersionNT = WindowsMinVersionNumber And ServicePackLevel >= WindowsMinSPNumber)OOO_LAUNCH_2 -VersionNT <> 603 Or WIN81S14 OOO_LAUNCH_3 +Installed Or VersionNT > WindowsMinVersionNumber Or (VersionNT = WindowsMinVersionNumber And ServicePackLevel >= WindowsMinSPNumber) OOO_LAUNCH_2 +Installed Or VersionNT <> 603 Or WIN81S14 OOO_LAUNCH_3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: remarks about development wiki / LODE
Hi Wols, On Friday, 2018-04-13 18:54:29 +0100, Wols Lists wrote: > Might it be better to say "All versions of Windows currently supported > by Microsoft"? That again could be ambiguous, with Windows Mobile ... Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf116985.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 10 ++
sw/source/core/layout/anchoreddrawobject.cxx | 17 -
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit c8b976ac64c9cac360f7c4fd9844fcfac7ba25a8
Author: Miklos Vajna
Date: Fri Apr 13 15:09:53 2018 +0200
tdf#116985 sw: fix geometry of textbox of shape with relative size
Relative size of shapes are calculated by the layout, so the normal doc
model-level synchronization between the shape and its textbox was not
enough.
Change-Id: Ia6f460132efaf03a7ba3a023cf751f6fff74404d
Reviewed-on: https://gerrit.libreoffice.org/52831
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/data/tdf116985.docx
b/sw/qa/extras/ooxmlexport/data/tdf116985.docx
new file mode 100644
index ..2a8e2023884d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf116985.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index ea584e6c6ef9..9e7d943d3e37 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -359,6 +359,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116976, "tdf116976.docx")
getProperty(getShape(1), "RelativeWidth"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf116985, "tdf116985.docx")
+{
+// Body frame width is 10800, 40% is the requested relative width, with 144
+// spacing to text on the left/right side. So ideal width would be 4032,
+// was 3431. Allow one pixel tolerance, though.
+sal_Int32 nWidth
+= parseDump("/root/page[1]/body/txt[1]/anchored/fly/infos/bounds",
"width").toInt32();
+CPPUNIT_ASSERT(nWidth > 4000);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx
b/sw/source/core/layout/anchoreddrawobject.cxx
index 8f96c6fd8bca..e1afbd3feb3a 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -32,6 +32,8 @@
#include
#include
#include
+#include
+#include
using namespace ::com::sun::star;
@@ -659,9 +661,22 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
bool bEnableSetModified =
pDoc->getIDocumentState().IsEnableSetModified();
pDoc->getIDocumentState().SetEnableSetModified(false);
-const_cast< SdrObject* >( GetDrawObj() )->Resize(
aCurrObjRect.TopLeft(),
+auto pObject = const_cast(GetDrawObj());
+pObject->Resize( aCurrObjRect.TopLeft(),
Fraction( nTargetWidth, aCurrObjRect.GetWidth() ),
Fraction( nTargetHeight, aCurrObjRect.GetHeight() ), false
);
+
+if (SwFrameFormat* pFrameFormat = FindFrameFormat(pObject))
+{
+if (SwTextBoxHelper::isTextBox(pFrameFormat, RES_DRAWFRMFMT))
+{
+// Shape has relative size and also a textbox, update its
text area as well.
+uno::Reference
xShape(pObject->getUnoShape(), uno::UNO_QUERY);
+SwTextBoxHelper::syncProperty(pFrameFormat, RES_FRM_SIZE,
MID_FRMSIZE_SIZE,
+
uno::makeAny(xShape->getSize()));
+}
+}
+
pDoc->getIDocumentState().SetEnableSetModified(bEnableSetModified);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: remarks about development wiki / LODE
On 05/04/18 01:24, Thorsten Behrens wrote: > Hi Dennis, I know I'm late to the party, but ... > > Dennis Roczek wrote: >> If this "tutorial" is for newbees, then tell them that Windows 7+ is >> supported, otherwise some might come with an old Windows XP or even >> stranger system. >> > Very well, added that. ;) Might it be better to say "All versions of Windows currently supported by Microsoft"? What will happen when MS drop support for Win7? I'm sure it will bitrot fairly quickly, and this will save somebody from forgetting to update the wiki :-) > > >> For this a general overview is often missing. (This is not a rant >> saying the TDF should do that, this is simply a rant!) >> > Concretely, what for? For the code itself, that's a truly hard problem > (with people like Chris trying to tackle it via book writing). > Maybe Dennis can write one? Writing wikis is hard ... (I should know - for my pains I've volunteered as editor for one :-) but I do agree with Dennis a bit - even a one-screen overview telling people where to look for more detail would be great. Simple rule - if a single chunk of text (be it code, wiki, whatever) doesn't fit on one screen in a decent-size font, it's too big :-) Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
dev/null |binary
sc/qa/unit/data/contentCSV/dataValidity3.csv |4 --
sc/qa/unit/data/ods/dataValidity.ods |binary
sc/qa/unit/subsequent_filters-test.cxx | 39 ---
4 files changed, 43 deletions(-)
New commits:
commit f762607ae0f1ea02323401de387318b7b0f09a36
Author: Eike Rathke
Date: Fri Apr 13 17:56:57 2018 +0100
Revert "calc: unit tests for data validation"
This reverts commit 78d774381b09fc244de162211e9c3fbfe891cbea.
Makes unit tests fail, see comment in https://gerrit.libreoffice.org/50381
Change-Id: I16d00540e12482c47e9a300958746730f12c008a
Reviewed-on: https://gerrit.libreoffice.org/52849
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/qa/unit/data/contentCSV/dataValidity3.csv
b/sc/qa/unit/data/contentCSV/dataValidity3.csv
deleted file mode 100644
index a8c82cecabdf..
--- a/sc/qa/unit/data/contentCSV/dataValidity3.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"",,
-"",,Enter text not a numeric value.
-"",,
-"",,AAA12
diff --git a/sc/qa/unit/data/ods/dataValidity.ods
b/sc/qa/unit/data/ods/dataValidity.ods
index 9daf01ce7798..008cea5561fc 100644
Binary files a/sc/qa/unit/data/ods/dataValidity.ods and
b/sc/qa/unit/data/ods/dataValidity.ods differ
diff --git a/sc/qa/unit/data/xlsx/dataValidity.xlsx
b/sc/qa/unit/data/xlsx/dataValidity.xlsx
deleted file mode 100644
index da4d3ab41133..
Binary files a/sc/qa/unit/data/xlsx/dataValidity.xlsx and /dev/null differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 6d7d2496aa2e..2e876434ce49 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -137,7 +137,6 @@ public:
void testMergedCellsODS();
void testRepeatedColumnsODS();
void testDataValidityODS();
-void testDataValidityXLSX();
void testDataTableMortgageXLS();
void testDataTableOneVarXLSX();
void testDataTableMultiTableXLSX();
@@ -279,7 +278,6 @@ public:
CPPUNIT_TEST(testMergedCellsODS);
CPPUNIT_TEST(testRepeatedColumnsODS);
CPPUNIT_TEST(testDataValidityODS);
-CPPUNIT_TEST(testDataValidityXLSX);
CPPUNIT_TEST(testDataTableMortgageXLS);
CPPUNIT_TEST(testDataTableOneVarXLSX);
CPPUNIT_TEST(testDataTableMultiTableXLSX);
@@ -1334,7 +1332,6 @@ void ScFiltersTest::testDataValidityODS()
ScAddress aValBaseAddr1( 2,6,0 ); //sheet1
ScAddress aValBaseAddr2( 2,3,1 ); //sheet2
-ScAddress aValBaseAddr3( 2,2,2 ); //sheet3
//sheet1's expected Data Validation Entry values
ValDataTestParams aVDTParams1(
@@ -1350,27 +1347,17 @@ void ScFiltersTest::testDataValidityODS()
"Must be a whole number between 1 and 10.",
SC_VALERR_STOP, 2
);
-//sheet3's expected Data Validation Entry values
-ValDataTestParams aVDTParams3(
-SC_VALID_CUSTOM, ScConditionMode::Direct, "ISTEXT(C3)",
EMPTY_OUSTRING, rDoc,
-aValBaseAddr3, "Error sheet 3",
-"Must not be a numerical value.",
-SC_VALERR_STOP, 3
-);
//check each sheet's Data Validation Entries
checkValiditationEntries( aVDTParams1 );
checkValiditationEntries( aVDTParams2 );
-checkValiditationEntries( aVDTParams3 );
//expected ranges to be associated with data validity
ScRange aRange1( 2,2,0, 2,6,0 ); //sheet1
ScRange aRange2( 2,3,1, 6,7,1 ); //sheet2
-ScRange aRange3( 2,2,2, 2,6,2 ); //sheet3
//check each sheet's cells for data validity
checkCellValidity( aValBaseAddr1, aRange1, rDoc );
checkCellValidity( aValBaseAddr2, aRange2, rDoc );
-checkCellValidity( aValBaseAddr3, aRange3, rDoc );
//check each sheet's content
OUString aCSVFileName1;
@@ -1381,32 +1368,6 @@ void ScFiltersTest::testDataValidityODS()
createCSVPath("dataValidity2.", aCSVFileName2);
testFile(aCSVFileName2, rDoc, 1);
-OUString aCSVFileName3;
-createCSVPath("dataValidity3.", aCSVFileName3);
-testFile(aCSVFileName3, rDoc, 2);
-
-xDocSh->DoClose();
-}
-
-void ScFiltersTest::testDataValidityXLSX()
-{
-ScDocShellRef xDocSh = loadDoc("dataValidity.", FORMAT_XLSX);
-ScDocument& rDoc = xDocSh->GetDocument();
-
-ScAddress aValBaseAddr1( 2,6,0 ); //sheet1
-ScAddress aValBaseAddr2( 2,3,1 ); //sheet2
-ScAddress aValBaseAddr3( 2,2,2 ); //sheet3
-
-//expected ranges to be associated with data validity
-ScRange aRange1( 2,2,0, 2,6,0 ); //sheet1
-ScRange aRange2( 2,3,1, 6,7,1 ); //sheet2
-ScRange aRange3( 2,2,2, 2,6,2 ); //sheet3
-
-//check each sheet's cells for data validity
-checkCellValidity( aValBaseAddr1, aRange1, rDoc );
-checkCellValidity( aValBaseAddr2, aRange2, rDoc );
-checkCellValidity( aValBaseAddr3, aRange3, rDoc );
-
xDocSh->DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop
[Libreoffice-commits] core.git: solenv/gbuild solenv/sanitizers
solenv/gbuild/UIConfig.mk |4 ++-- solenv/sanitizers/ui/cui.suppr |4 solenv/sanitizers/ui/filter.suppr |1 + solenv/sanitizers/ui/modules/scalc.suppr| 25 + solenv/sanitizers/ui/modules/simpress.suppr |3 +++ solenv/sanitizers/ui/modules/swriter.suppr |8 solenv/sanitizers/ui/svx.suppr | 17 + 7 files changed, 60 insertions(+), 2 deletions(-) New commits: commit c1084f6d791b69e612acfe7484f4f38b41662c80 Author: Samuel Thibault Date: Wed Apr 4 19:22:47 2018 +0200 gla11y: Enable label-for/labelled-by pairing warnings Change-Id: Icecc1cf3d7ec5c217e705640f1c4a049b75a6778 Reviewed-on: https://gerrit.libreoffice.org/52405 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 4923dd26e431..aec1efb33316 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -161,8 +161,8 @@ gb_UIConfig_gla11y_PARAMETERS += --enable-type orphan-label # These are definite errors gb_UIConfig_gla11y_PARAMETERS += --enable-type undeclared-target -#gb_UIConfig_gla11y_PARAMETERS += --enable-type missing-label-for -#gb_UIConfig_gla11y_PARAMETERS += --enable-type missing-labelled-by +gb_UIConfig_gla11y_PARAMETERS += --enable-type missing-label-for +gb_UIConfig_gla11y_PARAMETERS += --enable-type missing-labelled-by # These are often buttons with only an image #gb_UIConfig_gla11y_PARAMETERS += --enable-type button-no-label diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr index 598c7a600ae3..8f00b81c4cf2 100644 --- a/solenv/sanitizers/ui/cui.suppr +++ b/solenv/sanitizers/ui/cui.suppr @@ -6,3 +6,7 @@ cui/uiconfig/ui/hatchpage.ui://GtkLabel[@id='angleft'] orphan-label cui/uiconfig/ui/hatchpage.ui://GtkScale[@id='angleslider'] no-labelled-by cui/uiconfig/ui/hatchpage.ui://GtkLabel[@id='linetypeft'] orphan-label cui/uiconfig/ui/hatchpage.ui://GtkLabel[@id='linecolorft'] orphan-label +cui/uiconfig/ui/textflowpage.ui://GtkSpinButton[@id='spinPageNumber'] missing-label-for +cui/uiconfig/ui/textflowpage.ui://GtkComboBox[@id='comboPageStyle'] missing-label-for +cui/uiconfig/ui/textflowpage.ui://GtkSpinButton[@id='spinOrphan'] missing-label-for +cui/uiconfig/ui/textflowpage.ui://GtkSpinButton[@id='spinWidow'] missing-label-for diff --git a/solenv/sanitizers/ui/filter.suppr b/solenv/sanitizers/ui/filter.suppr new file mode 100644 index ..5cff1cecf634 --- /dev/null +++ b/solenv/sanitizers/ui/filter.suppr @@ -0,0 +1 @@ +filter/uiconfig/ui/pdfgeneralpage.ui://GtkCheckButton[@id='reduceresolution'] missing-labelled-by diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr new file mode 100644 index ..83ffb6cae818 --- /dev/null +++ b/solenv/sanitizers/ui/modules/scalc.suppr @@ -0,0 +1,25 @@ +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='connect1'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='field1'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='field2'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='field3'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='cond1'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='cond2'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='cond3'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='val1'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='val2'] missing-label-for +sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='val3'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='connect1'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='connect2'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='field1'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='field2'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='field3'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='cond1'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='cond2'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='cond3'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='val1'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='val2'] missing-label-for +sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='val3'] missing-label-for +sc/uiconfig/scalc/ui/selectsource.ui://GtkRadio
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 923b2acc1f6bad5ef344a4c6d7e2bac23c37d416
Author: Mert Tümer
Date: Thu Apr 5 15:18:46 2018 +0300
tdf#116820 The viewer does't show recent files
Change-Id: I8a4d4f2cb78a1fa772936e263e1aa3975e8f89ff
Signed-off-by: Mert Tümer
Reviewed-on: https://gerrit.libreoffice.org/52458
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index f8d08aae171f..938112c99149 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -444,6 +444,8 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
public void run() {
Toast.makeText(activity, e.getMessage(),
Toast.LENGTH_SHORT).show();
+// switch back to the default provider.
+
switchToDocumentProvider(documentProviderFactory.getDefaultProvider());
}
});
startActivity(new Intent(activity,
DocumentProviderSettingsActivity.class));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/InvalidationHandler.java | 10
++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 68ee5d5997197be3b087ed9f550da4dac6e21bef
Author: Mert Tümer
Date: Fri Apr 6 13:32:25 2018 +0300
tdf#116842 fix crashing when adding slides or spreadsheets
Change-Id: I957133e468fe43edd0ed1d76cdd180f20d6a86ac
Signed-off-by: Mert Tümer
Reviewed-on: https://gerrit.libreoffice.org/52493
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index b33f678de90f..92e81febeb7c 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -251,10 +251,12 @@ public class InvalidationHandler implements
Document.MessageCallback, Office.Mes
}
private void pageSizeChanged(String payload){
-String[] bounds = payload.split(",");
-int pageWidth = Integer.parseInt(bounds[0]);
-int pageHeight = Integer.parseInt(bounds[1].trim());
-LOKitShell.sendEvent(new LOEvent(LOEvent.PAGE_SIZE_CHANGED, pageWidth,
pageHeight));
+if(mContext.getTileProvider().isTextDocument()){
+String[] bounds = payload.split(",");
+int pageWidth = Integer.parseInt(bounds[0]);
+int pageHeight = Integer.parseInt(bounds[1].trim());
+LOKitShell.sendEvent(new LOEvent(LOEvent.PAGE_SIZE_CHANGED,
pageWidth, pageHeight));
+}
}
private void stateChanged(String payload) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source sc/uiconfig
sc/inc/scabstdlg.hxx |2
sc/qa/unit/screenshots/screenshots.cxx |2
sc/source/ui/attrdlg/scdlgfact.cxx | 16 ++--
sc/source/ui/attrdlg/scdlgfact.hxx | 10 ++
sc/source/ui/inc/delcodlg.hxx | 35 -
sc/source/ui/miscdlgs/delcodlg.cxx | 120 ++---
sc/source/ui/view/cellsh1.cxx |2
sc/uiconfig/scalc/ui/deletecontents.ui |8 +-
8 files changed, 95 insertions(+), 100 deletions(-)
New commits:
commit a2f6b01f41720876ed038a25ea92d381528618ad
Author: Caolán McNamara
Date: Fri Apr 13 14:24:59 2018 +0100
weld ScDeleteContentsDlg
Change-Id: Ibd3723fc615d97a4747a41e881dbad6829929c0c
Reviewed-on: https://gerrit.libreoffice.org/52833
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index c2d8d757127c..3821a8f8f907 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -429,7 +429,7 @@ public:
virtual VclPtr CreateScDataFormDlg(vcl::Window*
pParent,
ScTabViewShell* pTabViewShell) = 0;
-virtual VclPtr
CreateScDeleteContentsDlg(vcl::Window* pParent) = 0;
+virtual VclPtr
CreateScDeleteContentsDlg(weld::Window* pParent) = 0;
virtual VclPtr CreateScFillSeriesDlg(
vcl::Window*pParent,
ScDocument&
rDocument,
FillDir
eFillDir,
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 3822be9358e4..d7d6a45e9231 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -191,7 +191,7 @@ VclPtr
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 6: // "modules/scalc/ui/deletecontents.ui"
{
-pReturnDialog =
mpFact->CreateScDeleteContentsDlg(mpViewShell->GetDialogParent());
+pReturnDialog =
mpFact->CreateScDeleteContentsDlg(mpViewShell->GetFrameWeld());
break;
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 51cce4e6b8dd..4a7925f2a33c 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -90,7 +90,12 @@ short AbstractScDeleteCellDlg_Impl::Execute()
//for dataform
IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl);
+
+short AbstractScDeleteContentsDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl);
@@ -257,12 +262,12 @@ DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd()
const
void AbstractScDeleteContentsDlg_Impl::DisableObjects()
{
-pDlg->DisableObjects();
+m_xDlg->DisableObjects();
}
InsertDeleteFlags AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits()
const
{
-return pDlg->GetDelContentsCmdBits();
+return m_xDlg->GetDelContentsCmdBits();
}
FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const
@@ -702,10 +707,9 @@ VclPtr
ScAbstractDialogFactory_Impl::CreateScDataFormDlg(
return VclPtr::Create(pDlg);
}
-VclPtr
ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(vcl::Window* pParent)
+VclPtr
ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(weld::Window* pParent)
{
-VclPtr pDlg =
VclPtr::Create(pParent, InsertDeleteFlags::NONE);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
ScDeleteContentsDlg(pParent, InsertDeleteFlags::NONE));
}
VclPtr
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( vcl::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 5ecd16122d38..3c056db5a36b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -180,7 +180,13 @@ class AbstractScDataFormDlg_Impl : public
AbstractScDataFormDlg
class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg
{
-DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScDeleteContentsDlg_Impl(ScDeleteContentsDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
virtual voidDisableObjects() override;
virtual InsertDeleteFlags GetDelContentsCmdBits() const override;
};
@@ -453,7 +459,7 @@ public:
virtual VclPtr CreateScDataFormDlg(vcl::Window*
pParent,
ScTabViewShell* pTabViewShell) override;
-virtual VclPtr
CreateScDeleteContentsDlg(vcl::Window* pParent) override;
+virtual VclPtr
CreateScDeleteContentsDlg(weld::Window* pParent) override;
virtual VclPtr CreateScFillSeriesDlg(
vcl::Window*pParent,
ScDocument&
rDocument,
diff --git a/sc/source/ui/inc
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpfrib.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b6e7e25578dbd7ed95f907e58d9e40fc51d9ddd8
Author: Caolán McNamara
Date: Fri Apr 13 14:33:27 2018 +0100
ofz#7648 Bad-cast
Change-Id: I21aaf36f3d6b6c3054649208de809b99aa384c01
Reviewed-on: https://gerrit.libreoffice.org/52834
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx
b/lotuswordpro/source/filter/lwpfrib.cxx
index 0da28697af3e..1e3bc5e77833 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -251,7 +251,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
XFTextStyle* pNamedStyle = nullptr;
if (m_pModifiers->HasCharStyle && pFoundry)
{
-pNamedStyle = static_cast
+pNamedStyle = dynamic_cast
(pFoundry->GetStyleManager()->GetStyle(m_pModifiers->CharStyleID));
}
if (pNamedStyle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/dialogs/SignSignatureLineDialog.cxx | 15 +++
cui/source/inc/SignSignatureLineDialog.hxx |2 +
cui/uiconfig/ui/signsignatureline.ui | 32 -
3 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 28db2de99a85f3b6397fbd372658853e8020bf15
Author: Samuel Mehrbrodt
Date: Fri Apr 13 15:22:45 2018 +0200
tdf#83877 Show signing instructions in sign dialog
Change-Id: I230ff1fcbc6f98755ae588dca32d77c442d5f042
Reviewed-on: https://gerrit.libreoffice.org/52832
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 3c3052901c26..1b39b1f8e61b 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -53,6 +53,8 @@
SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc
, m_xEditComment(m_xBuilder->weld_text_view("edit_comment"))
,
m_xBtnChooseCertificate(m_xBuilder->weld_button("btn_select_certificate"))
, m_xBtnSign(m_xBuilder->weld_button("ok"))
+, m_xLabelHint(m_xBuilder->weld_label("label_hint"))
+, m_xLabelHintText(m_xBuilder->weld_label("label_hint_text"))
{
Reference
xIndexAccess(m_xModel->getCurrentSelection(),
UNO_QUERY_THROW);
@@ -84,8 +86,21 @@
SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc
>>= m_aSuggestedSignerName;
m_xShapeProperties->getPropertyValue("SignatureLineSuggestedSignerTitle")
>>= m_aSuggestedSignerTitle;
+OUString aSigningInstructions;
+m_xShapeProperties->getPropertyValue("SignatureLineSigningInstructions")
+>>= aSigningInstructions;
m_xShapeProperties->getPropertyValue("SignatureLineShowSignDate") >>=
m_bShowSignDate;
+if (aSigningInstructions.isEmpty())
+{
+m_xLabelHint->hide();
+m_xLabelHintText->hide();
+}
+else
+{
+m_xLabelHintText->set_label(aSigningInstructions);
+}
+
ValidateFields();
}
diff --git a/cui/source/inc/SignSignatureLineDialog.hxx
b/cui/source/inc/SignSignatureLineDialog.hxx
index c7a6e565bd7b..fb9c1c1ca2d0 100644
--- a/cui/source/inc/SignSignatureLineDialog.hxx
+++ b/cui/source/inc/SignSignatureLineDialog.hxx
@@ -25,6 +25,8 @@ private:
std::unique_ptr m_xEditComment;
std::unique_ptr m_xBtnChooseCertificate;
std::unique_ptr m_xBtnSign;
+std::unique_ptr m_xLabelHint;
+std::unique_ptr m_xLabelHintText;
css::uno::Reference m_xShapeProperties;
css::uno::Reference m_xSelectedCertifate;
diff --git a/cui/uiconfig/ui/signsignatureline.ui
b/cui/uiconfig/ui/signsignatureline.ui
index 860da621d4f4..87bdefdfa74c 100644
--- a/cui/uiconfig/ui/signsignatureline.ui
+++ b/cui/uiconfig/ui/signsignatureline.ui
@@ -190,7 +190,7 @@
0
-0
+2
@@ -212,6 +212,36 @@
0
+3
+
+
+
+
+True
+False
+start
+Instructions from the document
creator:
+True
+label_hint_text
+
+
+0
+0
+
+
+
+
+True
+False
+start
+12
+edit_comment
+
+
+
+
+
+0
1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - instsetoo_native/inc_openoffice solenv/bin
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |2 +-
instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt |2 +-
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |1 +
solenv/bin/modules/installer/windows/property.pm |4 +++-
4 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 158f6e5489d8167299deb53fde433e835019d10a
Author: Mike Kaganski
Date: Mon Apr 9 09:33:20 2018 +0100
tdf#108580 related: Check for SP level of the minimal supported OS
Currently we support Win7 SP1 and later; so let installer fail on lower SP
levels.
Change-Id: I807e0a04870b9eeabbfae258d68da4a1156b0408
Reviewed-on: https://gerrit.libreoffice.org/52619
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 79383148bb31bee0c8fae941f6cc0fdd605fb2ea)
Reviewed-on: https://gerrit.libreoffice.org/52632
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 680961b4f744..303202c31f5f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -71,4 +71,4 @@ ValidateProductID 300
WriteEnvironmentStrings2500
WriteIniValues 2450
WriteRegistryValues2400
-WrongWindowsVersionVersionNT < WindowsMinVersionNumber 10
+WrongWindowsVersion(VersionNT < WindowsMinVersionNumber) OR ((VersionNT =
WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber))10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
index 24642ecaeb74..9a507df4175f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
@@ -28,4 +28,4 @@ SetupProgress 800
SetupResumeInstalled And (RESUME Or Preselected) And Not PATCH 700
setUserProfile 510
ValidateProductID 350
-WrongWindowsVersionVersionNT < WindowsMinVersionNumber 10
+WrongWindowsVersion(VersionNT < WindowsMinVersionNumber) OR ((VersionNT =
WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber))10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index b16732079076..f8eeaf25c105 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -64,3 +64,4 @@ UpgradeCode UPGRADECODETEMPLATE
VC_REDIST 1
WindowsMinVersionText WINDOWSMINVERSIONTEXTTEMPLATE
WindowsMinVersionNumberWINDOWSMINVERSIONNUMBERTEMPLATE
+WindowsMinSPNumber WINDOWSMINSPNUMBERTEMPLATE
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 61b18ac29a56..a0ad3698aa10 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -419,8 +419,9 @@ sub update_property_table
my $productname = get_productname_for_property_table($language,
$allvariables);
my $productversion = get_productversion_for_property_table();
my $quickstarterlinkname =
get_quickstarterlinkname_for_property_table($language, $allvariables);
-my $windowsminversiontext = "Windows 7";
+my $windowsminversiontext = "Windows 7 SP1";
my $windowsminversionnumber = "601";
+my $windowsminspnumber = "1";
# Updating the values
@@ -436,6 +437,7 @@ sub update_property_table
${$propertyfile}[$i] =~
s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
${$propertyfile}[$i] =~
s/\bWINDOWSMINVERSIONTEXTTEMPLATE\b/$windowsminversiontext/;
${$propertyfile}[$i] =~
s/\bWINDOWSMINVERSIONNUMBERTEMPLATE\b/$windowsminversionnumber/;
+${$propertyfile}[$i] =~
s/\bWINDOWSMINSPNUMBERTEMPLATE\b/$windowsminspnumber/;
if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify =
1; }
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/contentCSV/dataValidity3.csv |4 ++
sc/qa/unit/data/ods/dataValidity.ods |binary
sc/qa/unit/data/xlsx/dataValidity.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx | 39 +++
4 files changed, 43 insertions(+)
New commits:
commit 78d774381b09fc244de162211e9c3fbfe891cbea
Author: Marco Cecchetti
Date: Mon Feb 26 17:50:25 2018 +0100
calc: unit tests for data validation
Change-Id: I51e1d992236de8ecc3e7dcf0085d629c5b863776
Reviewed-on: https://gerrit.libreoffice.org/50381
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/qa/unit/data/contentCSV/dataValidity3.csv
b/sc/qa/unit/data/contentCSV/dataValidity3.csv
new file mode 100644
index ..a8c82cecabdf
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/dataValidity3.csv
@@ -0,0 +1,4 @@
+"",,
+"",,Enter text not a numeric value.
+"",,
+"",,AAA12
diff --git a/sc/qa/unit/data/ods/dataValidity.ods
b/sc/qa/unit/data/ods/dataValidity.ods
index 008cea5561fc..9daf01ce7798 100644
Binary files a/sc/qa/unit/data/ods/dataValidity.ods and
b/sc/qa/unit/data/ods/dataValidity.ods differ
diff --git a/sc/qa/unit/data/xlsx/dataValidity.xlsx
b/sc/qa/unit/data/xlsx/dataValidity.xlsx
new file mode 100644
index ..da4d3ab41133
Binary files /dev/null and b/sc/qa/unit/data/xlsx/dataValidity.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 2e876434ce49..6d7d2496aa2e 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -137,6 +137,7 @@ public:
void testMergedCellsODS();
void testRepeatedColumnsODS();
void testDataValidityODS();
+void testDataValidityXLSX();
void testDataTableMortgageXLS();
void testDataTableOneVarXLSX();
void testDataTableMultiTableXLSX();
@@ -278,6 +279,7 @@ public:
CPPUNIT_TEST(testMergedCellsODS);
CPPUNIT_TEST(testRepeatedColumnsODS);
CPPUNIT_TEST(testDataValidityODS);
+CPPUNIT_TEST(testDataValidityXLSX);
CPPUNIT_TEST(testDataTableMortgageXLS);
CPPUNIT_TEST(testDataTableOneVarXLSX);
CPPUNIT_TEST(testDataTableMultiTableXLSX);
@@ -1332,6 +1334,7 @@ void ScFiltersTest::testDataValidityODS()
ScAddress aValBaseAddr1( 2,6,0 ); //sheet1
ScAddress aValBaseAddr2( 2,3,1 ); //sheet2
+ScAddress aValBaseAddr3( 2,2,2 ); //sheet3
//sheet1's expected Data Validation Entry values
ValDataTestParams aVDTParams1(
@@ -1347,17 +1350,27 @@ void ScFiltersTest::testDataValidityODS()
"Must be a whole number between 1 and 10.",
SC_VALERR_STOP, 2
);
+//sheet3's expected Data Validation Entry values
+ValDataTestParams aVDTParams3(
+SC_VALID_CUSTOM, ScConditionMode::Direct, "ISTEXT(C3)",
EMPTY_OUSTRING, rDoc,
+aValBaseAddr3, "Error sheet 3",
+"Must not be a numerical value.",
+SC_VALERR_STOP, 3
+);
//check each sheet's Data Validation Entries
checkValiditationEntries( aVDTParams1 );
checkValiditationEntries( aVDTParams2 );
+checkValiditationEntries( aVDTParams3 );
//expected ranges to be associated with data validity
ScRange aRange1( 2,2,0, 2,6,0 ); //sheet1
ScRange aRange2( 2,3,1, 6,7,1 ); //sheet2
+ScRange aRange3( 2,2,2, 2,6,2 ); //sheet3
//check each sheet's cells for data validity
checkCellValidity( aValBaseAddr1, aRange1, rDoc );
checkCellValidity( aValBaseAddr2, aRange2, rDoc );
+checkCellValidity( aValBaseAddr3, aRange3, rDoc );
//check each sheet's content
OUString aCSVFileName1;
@@ -1368,6 +1381,32 @@ void ScFiltersTest::testDataValidityODS()
createCSVPath("dataValidity2.", aCSVFileName2);
testFile(aCSVFileName2, rDoc, 1);
+OUString aCSVFileName3;
+createCSVPath("dataValidity3.", aCSVFileName3);
+testFile(aCSVFileName3, rDoc, 2);
+
+xDocSh->DoClose();
+}
+
+void ScFiltersTest::testDataValidityXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("dataValidity.", FORMAT_XLSX);
+ScDocument& rDoc = xDocSh->GetDocument();
+
+ScAddress aValBaseAddr1( 2,6,0 ); //sheet1
+ScAddress aValBaseAddr2( 2,3,1 ); //sheet2
+ScAddress aValBaseAddr3( 2,2,2 ); //sheet3
+
+//expected ranges to be associated with data validity
+ScRange aRange1( 2,2,0, 2,6,0 ); //sheet1
+ScRange aRange2( 2,3,1, 6,7,1 ); //sheet2
+ScRange aRange3( 2,2,2, 2,6,2 ); //sheet3
+
+//check each sheet's cells for data validity
+checkCellValidity( aValBaseAddr1, aRange1, rDoc );
+checkCellValidity( aValBaseAddr2, aRange2, rDoc );
+checkCellValidity( aValBaseAddr3, aRange3, rDoc );
+
xDocSh->DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
sc/source/ui/view/gridwin4.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit e8080c79043a7d9036f27cc24b76b7ff21c58da8 Author: Caolán McNamara Date: Thu Apr 12 14:53:20 2018 +0100 Related: tdf#100925 background not getting set under X sometimes not sure why this is the case, but it is reminiscent of rhbz#1283420 which results in missing glyphs in some circumstances X11CairoTextRender::getCairoContext has a hack in it for that problem, whic forces a read from the underlying X Drawable before writing to it which seems to have the effect of syncing it up. So, just before drawing the bg, draw a glyph on it to get it synced, and then overwrite it. Change-Id: I27e8e989b91821869d8b75a59728ac513d1b Reviewed-on: https://gerrit.libreoffice.org/52819 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 74151217831c..adb2db31a1df 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1029,7 +1029,12 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI } // paint the background -rDevice.DrawRect(rDevice.PixelToLogic(aBackground)); +tools::Rectangle aLogicRect(rDevice.PixelToLogic(aBackground)); +//tdf#100925, rhbz#1283420, Draw some text here, to get +//X11CairoTextRender::getCairoContext called, so that the forced read +//from the underlying X Drawable gets it to sync. +rDevice.DrawText(aLogicRect.BottomLeft(), " "); +rDevice.DrawRect(aLogicRect); // paint the editeng text tools::Rectangle aEditRect(Point(nScrX, nScrY), Size(aOutputData.GetScrW(), aOutputData.GetScrH())); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/ui/view/gridwin4.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit ccb90e3266336d6b022c48ec90cd55450c9c209e Author: Caolán McNamara Date: Thu Apr 12 14:53:20 2018 +0100 Related: tdf#100925 background not getting set under X sometimes not sure why this is the case, but it is reminiscent of rhbz#1283420 which results in missing glyphs in some circumstances X11CairoTextRender::getCairoContext has a hack in it for that problem, whic forces a read from the underlying X Drawable before writing to it which seems to have the effect of syncing it up. So, just before drawing the bg, draw a glyph on it to get it synced, and then overwrite it. Change-Id: I27e8e989b91821869d8b75a59728ac513d1b Reviewed-on: https://gerrit.libreoffice.org/52818 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 92b0eee6cc96..83d4e18ce8cd 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1021,7 +1021,12 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI } // paint the background -rDevice.DrawRect(rDevice.PixelToLogic(aBackground)); +tools::Rectangle aLogicRect(rDevice.PixelToLogic(aBackground)); +//tdf#100925, rhbz#1283420, Draw some text here, to get +//X11CairoTextRender::getCairoContext called, so that the forced read +//from the underlying X Drawable gets it to sync. +rDevice.DrawText(aLogicRect.BottomLeft(), " "); +rDevice.DrawRect(aLogicRect); // paint the editeng text tools::Rectangle aEditRect(Point(nScrX, nScrY), Size(aOutputData.GetScrW(), aOutputData.GetScrH())); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/ui/view/select.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 14b042d86e5d3e20dbc73efe08b831810bd52711
Author: Caolán McNamara
Date: Tue Apr 10 16:55:50 2018 +0100
Resolves: tdf#116813 Height/Width swapped
Change-Id: I9b41a4b65fda895ed73fa346fb0b8e13df010706
Reviewed-on: https://gerrit.libreoffice.org/52693
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index fcfe6eddf1c5..b8dd689eb640 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -329,8 +329,8 @@ bool ScViewFunctionSet::SetCursorAtPoint( const Point&
rPointPixel, bool /* bDon
// above a neighbour cell
if (bFillingSelection)
{
-bBottomScroll = aEffPos.X() >= aWinSize.Height();
-bRightScroll = aEffPos.Y() >= aWinSize.Width();
+bBottomScroll = aEffPos.Y() >= aWinSize.Height();
+bRightScroll = aEffPos.X() >= aWinSize.Width();
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fudraw.cxx | 59 +--
1 file changed, 29 insertions(+), 30 deletions(-)
New commits:
commit c7272eea116350e1424d59c358d8528016a2f713
Author: Vasily Melenchuk
Date: Thu Apr 12 18:06:54 2018 +0300
sd: hyperlink hint was not always shown
Change-Id: Ic885688ce0f757c3230a5e355a4eef8da71dbda1
Reviewed-on: https://gerrit.libreoffice.org/52785
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index cfc73674c678..76d3edf027a3 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -791,6 +791,35 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point&
rPosPixel, const SdrViewE
}
}
}
+else if (rVEvt.pURLField)
+{
+/**
+* URL-Field
+**/
+OUString aURL = INetURLObject::decode(rVEvt.pURLField->GetURL(),
INetURLObject::DecodeMechanism::WithCharset);
+
+SvtSecurityOptions aSecOpt;
+if
(aSecOpt.IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink))
+{
+// Hint about Ctrl-click to open hyperlink, but need to detect
"Ctrl" key for MacOs
+vcl::KeyCode aCode(KEY_SPACE);
+vcl::KeyCode aModifiedCode(KEY_SPACE, KEY_MOD1);
+OUString aModStr(aModifiedCode.GetName());
+aModStr = aModStr.replaceFirst(aCode.GetName(), "");
+aModStr = aModStr.replaceAll("+", "");
+
+OUString aCtrlClickHlinkStr = SdResId(STR_CTRLCLICKHYPERLINK);
+
+aCtrlClickHlinkStr = aCtrlClickHlinkStr.replaceAll("%s", aModStr);
+
+aHelpText = aCtrlClickHlinkStr + aURL;
+}
+else
+{
+// Hint about just clicking hyperlink
+aHelpText = SdResId(STR_CLICKHYPERLINK) + aURL;
+}
+}
else if (dynamic_cast< GraphicDocShell *>( mpDocSh ) == nullptr &&
SdDrawDocument::GetAnimationInfo(pObj))
{
SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
@@ -898,36 +927,6 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point&
rPosPixel, const SdrViewE
break;
}
}
-else if (rVEvt.pURLField)
-{
-/**
-* URL-Field
-**/
-OUString aURL = INetURLObject::decode( rVEvt.pURLField->GetURL(),
INetURLObject::DecodeMechanism::WithCharset );
-
-SvtSecurityOptions aSecOpt;
-if
(aSecOpt.IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink))
-{
-// Hint about Ctrl-click to open hyperlink
-// But need to detect "Ctrl" key for MacOs
-vcl::KeyCode aCode(KEY_SPACE);
-vcl::KeyCode aModifiedCode(KEY_SPACE, KEY_MOD1);
-OUString aModStr(aModifiedCode.GetName());
-aModStr = aModStr.replaceFirst(aCode.GetName(), "");
-aModStr = aModStr.replaceAll("+", "");
-
-OUString aCtrlClickHlinkStr = SdResId(STR_CTRLCLICKHYPERLINK);
-
-aCtrlClickHlinkStr = aCtrlClickHlinkStr.replaceAll("%s", aModStr);
-
-aHelpText = aCtrlClickHlinkStr + aURL;
-}
-else
-{
-// Hint about just clicking hyperlink
-aHelpText = SdResId(STR_CLICKHYPERLINK) + aURL;
-}
-}
if (!aHelpText.isEmpty())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source sc/uiconfig
sc/inc/scabstdlg.hxx |2 -
sc/qa/unit/screenshots/screenshots.cxx|2 -
sc/source/ui/attrdlg/scdlgfact.cxx| 14 +++
sc/source/ui/attrdlg/scdlgfact.hxx| 10 ++-
sc/source/ui/inc/namecrea.hxx | 17 +
sc/source/ui/miscdlgs/namecrea.cxx| 38 +++---
sc/source/ui/view/cellsh1.cxx |2 -
sc/uiconfig/scalc/ui/createnamesdialog.ui | 10 ++-
8 files changed, 49 insertions(+), 46 deletions(-)
New commits:
commit 57f2882ae218e3500cc2f28ee27db7be606316d3
Author: Caolán McNamara
Date: Fri Apr 13 14:00:33 2018 +0100
weld ScNameCreateDlg
Change-Id: I8b75647a419020504adc2cdff7c6d046ef043491
Reviewed-on: https://gerrit.libreoffice.org/52830
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index f624f343029d..c2d8d757127c 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -468,7 +468,7 @@ public:
virtual VclPtr CreateScMoveTableDlg(vcl::Window *
pParent,
const OUString& rDefault) = 0;
-virtual VclPtr CreateScNameCreateDlg(vcl::Window
* pParent,
+virtual VclPtr CreateScNameCreateDlg(weld::Window
* pParent,
CreateNameFlags nFlags) = 0;
virtual VclPtr CreateScNamePasteDlg ( vcl::Window
* pParent, ScDocShell* pShell ) = 0;
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 6268c9f94cda..3822be9358e4 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -198,7 +198,7 @@ VclPtr
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 7: // "modules/scalc/ui/createnamesdialog.ui"
{
pReturnDialog = mpFact->CreateScNameCreateDlg(
-mpViewShell->GetDialogParent(),
+mpViewShell->GetFrameWeld(),
CreateNameFlags::Left | CreateNameFlags::Top);
// just fake some flags
break;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 37da3f4d980d..51cce4e6b8dd 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -104,7 +104,12 @@ IMPL_ABSTDLG_BASE(AbstractScInsertTableDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScSelEntryDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScMetricInputDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScMoveTableDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScNameCreateDlg_Impl);
+
+short AbstractScNameCreateDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
IMPL_ABSTDLG_BASE(AbstractScNamePasteDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDPFunctionDlg_Impl);
@@ -494,7 +499,7 @@ voidAbstractScMoveTableDlg_Impl::EnableRenameTable(bool
bFlag)
CreateNameFlags AbstractScNameCreateDlg_Impl::GetFlags() const
{
-return pDlg->GetFlags();
+return m_xDlg->GetFlags();
}
std::vector AbstractScNamePasteDlg_Impl::GetSelectedNames() const
@@ -777,10 +782,9 @@ VclPtr
ScAbstractDialogFactory_Impl::CreateScMoveTableDl
return VclPtr::Create( pDlg );
}
-VclPtr
ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(vcl::Window * pParent,
CreateNameFlags nFlags)
+VclPtr
ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(weld::Window * pParent,
CreateNameFlags nFlags)
{
-VclPtr pDlg = VclPtr::Create( pParent,
nFlags );
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
ScNameCreateDlg(pParent, nFlags));
}
VclPtr
ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( vcl::Window * pParent,
ScDocShell* pShell )
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 46982a8a2b67..5ecd16122d38 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -290,7 +290,13 @@ class AbstractScMoveTableDlg_Impl : public
AbstractScMoveTableDlg
class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg
{
-DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScNameCreateDlg_Impl(ScNameCreateDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
virtual CreateNameFlags GetFlags() const override;
};
@@ -487,7 +493,7 @@ public:
virtual VclPtr CreateScMoveTableDlg(vcl::Window *
pParent,
const OUString& rDefault) override;
-virtual VclPtr CreateScNameCreateDlg(vcl::Window
* pParent,
+virtual VclPtr CreateScNameCreateDlg(weld::Window
* pParent,
CreateNameFlags nFlags) override;
virtual VclPtr CreateScNamePasteDlg ( vcl::Window
* pParent, ScDocShell* pShell ) override;
diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx
index 0a530b2cb7ec..a2bcbe7f0394 100644
--- a/sc/source/ui/inc/namecrea.hxx
+++ b/sc/source/ui/inc/namecre
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSetBase.cxx |1 + dbaccess/source/core/api/RowSetBase.hxx |1 - dbaccess/source/core/api/RowSetCache.cxx|1 + dbaccess/source/core/api/WrappedResultSet.cxx |2 -- dbaccess/source/core/api/viewcontainer.cxx |2 -- dbaccess/source/core/dataaccess/ModelImpl.cxx |2 -- dbaccess/source/core/dataaccess/bookmarkcontainer.cxx |2 -- dbaccess/source/core/inc/ModelImpl.hxx |1 - dbaccess/source/core/misc/dsntypes.cxx |2 -- dbaccess/source/ext/macromigration/macromigrationpages.cxx |1 - dbaccess/source/ext/macromigration/macromigrationwizard.cxx |2 ++ dbaccess/source/ext/macromigration/macromigrationwizard.hxx |3 --- dbaccess/source/ui/app/AppController.hxx|1 - dbaccess/source/ui/app/AppDetailPageHelper.cxx |2 -- dbaccess/source/ui/app/AppSwapWindow.cxx|1 - dbaccess/source/ui/browser/brwview.cxx |1 - dbaccess/source/ui/browser/dsEntriesNoExp.cxx |1 - dbaccess/source/ui/browser/dsbrowserDnD.cxx |1 - dbaccess/source/ui/browser/formadapter.cxx |1 - dbaccess/source/ui/control/RelationControl.cxx |1 - dbaccess/source/ui/control/marktree.cxx |1 - dbaccess/source/ui/dlg/admincontrols.cxx|1 - dbaccess/source/ui/dlg/advancedsettings.cxx |1 - dbaccess/source/ui/dlg/dbfindex.cxx |1 - dbaccess/source/ui/dlg/dlgattr.cxx |1 - dbaccess/source/ui/dlg/dlgsize.cxx |1 - dbaccess/source/ui/dlg/queryfilter.cxx |1 - dbaccess/source/ui/dlg/textconnectionsettings.cxx |1 - dbaccess/source/ui/inc/FieldControls.hxx|1 - dbaccess/source/ui/inc/JoinController.hxx |1 - dbaccess/source/ui/inc/RelationDlg.hxx |1 - dbaccess/source/ui/inc/TableController.hxx |1 - dbaccess/source/ui/inc/TableGrantCtrl.hxx |1 - dbaccess/source/ui/inc/TokenWriter.hxx |1 - dbaccess/source/ui/inc/UserAdminDlg.hxx |1 - dbaccess/source/ui/inc/advancedsettingsdlg.hxx |1 - dbaccess/source/ui/inc/brwctrlr.hxx |1 - dbaccess/source/ui/inc/dbtreelistbox.hxx|1 - dbaccess/source/ui/inc/dbwiz.hxx|1 - dbaccess/source/ui/inc/dbwizsetup.hxx |1 - dbaccess/source/ui/inc/directsql.hxx|1 - dbaccess/source/ui/inc/formadapter.hxx |1 - dbaccess/source/ui/inc/indexfieldscontrol.hxx |1 - dbaccess/source/ui/inc/unoadmin.hxx |1 - dbaccess/source/ui/inc/unosqlmessage.hxx|1 - dbaccess/source/ui/misc/imageprovider.cxx |1 - dbaccess/source/ui/querydesign/JoinController.cxx |1 - dbaccess/source/ui/querydesign/JoinDesignView.cxx |1 - dbaccess/source/ui/querydesign/JoinTableView.cxx|1 - dbaccess/source/ui/querydesign/QTableWindow.cxx |1 - dbaccess/source/ui/querydesign/QueryTableView.cxx |1 + dbaccess/source/ui/querydesign/QueryTextView.cxx|1 - dbaccess/source/ui/querydesign/QueryViewSwitch.cxx |1 - dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |1 + dbaccess/source/ui/querydesign/TableWindow.cxx |1 - dbaccess/source/ui/querydesign/TableWindowAccess.cxx|1 - dbaccess/source/ui/querydesign/TableWindowTitle.cxx |1 - dbaccess/source/ui/querydesign/limitboxcontroller.cxx |1 - dbaccess/source/ui/relationdesign/RelationDesignView.cxx|1 - dbaccess/source/ui/tabledesign/FieldDescriptions.cxx|1 - dbaccess/source/ui/tabledesign/TEditControl.cxx |1 + dbaccess/source/ui/tabledesign/TableDesignControl.cxx |1 - dbaccess/source/ui/uno/composerdialogs.hxx |1 - dbaccess/source/ui/uno/dbinteraction.cxx|1 - dbaccess/source/ui/uno/dbinteraction.hxx|1 - dbaccess/source/ui/uno/textconnectionsettings_uno.cxx |1 - dbaccess/source/ui/uno/unoDirectSql.hxx |1 - 67 files changed, 7 insertions(+), 69 deletions(-) New commits: commit 83d247b9917ecf4e23d5a457252a998f233b5c30 Author: Gabor Kelemen Date: Sun Mar 18 16:03:47 2018 +0100 tdf#42949 Remove unnecessary localization headers from dbaccess Found by searching for the header names and th
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source sc/uiconfig
sc/inc/scabstdlg.hxx |2
sc/qa/unit/screenshots/screenshots.cxx |2
sc/source/ui/attrdlg/scdlgfact.cxx | 14 --
sc/source/ui/attrdlg/scdlgfact.hxx | 10 +++-
sc/source/ui/inc/delcldlg.hxx | 17 +++-
sc/source/ui/miscdlgs/delcldlg.cxx | 68 -
sc/source/ui/view/cellsh1.cxx |2
sc/uiconfig/scalc/ui/deletecells.ui| 18 +---
8 files changed, 74 insertions(+), 59 deletions(-)
New commits:
commit 1f5c0cf78d1dcc7420e93ae7c24d838931aba88d
Author: Caolán McNamara
Date: Fri Apr 13 13:46:51 2018 +0100
weld ScDeleteCellDlg
Change-Id: Ie85c51c019f892f647c2a13f67f47080ffa414b1
Reviewed-on: https://gerrit.libreoffice.org/52829
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index d970cac36827..f624f343029d 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -423,7 +423,7 @@ public:
virtual VclPtr CreateScDataPilotServiceDlg(
vcl::Window* pParent,
const
std::vector& rServices ) = 0;
-virtual VclPtr CreateScDeleteCellDlg(vcl::Window*
pParent, bool bDisallowCellMove) = 0 ;
+virtual VclPtr
CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove) = 0 ;
//for dataform
virtual VclPtr CreateScDataFormDlg(vcl::Window*
pParent,
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 3735ea54b123..6268c9f94cda 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -162,7 +162,7 @@ VclPtr
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 1: // "modules/scalc/ui/deletecells.ui"
{
-pReturnDialog =
mpFact->CreateScDeleteCellDlg(mpViewShell->GetDialogParent(), false);
+pReturnDialog =
mpFact->CreateScDeleteCellDlg(mpViewShell->GetFrameWeld(), false);
break;
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 2c7c7eb2ebba..37da3f4d980d 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -82,7 +82,12 @@ IMPL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl);
+
+short AbstractScDeleteCellDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
//for dataform
IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl);
@@ -242,7 +247,7 @@ OUString AbstractScDataPilotServiceDlg_Impl::GetParPass()
const
DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd() const
{
-return pDlg->GetDelCellCmd();
+return m_xDlg->GetDelCellCmd();
}
void AbstractScDeleteContentsDlg_Impl::DisableObjects()
@@ -679,11 +684,10 @@ VclPtr
ScAbstractDialogFactory_Impl::CreateScData
return VclPtr::Create( pDlg );
}
-VclPtr
ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(vcl::Window* pParent,
+VclPtr
ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(weld::Window* pParent,
bool bDisallowCellMove)
{
-VclPtr pDlg = VclPtr::Create(pParent,
bDisallowCellMove);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
ScDeleteCellDlg(pParent, bDisallowCellMove));
}
VclPtr
ScAbstractDialogFactory_Impl::CreateScDataFormDlg(vcl::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 1f2bcee38bce..46982a8a2b67 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -162,7 +162,13 @@ class AbstractScDataPilotServiceDlg_Impl : public
AbstractScDataPilotServiceDlg
class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg
{
-DECL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl,ScDeleteCellDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScDeleteCellDlg_Impl(ScDeleteCellDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
virtual DelCellCmd GetDelCellCmd() const override;
};
@@ -435,7 +441,7 @@ public:
virtual VclPtr CreateScDataPilotServiceDlg(
vcl::Window* pParent,
const
std::vector& rServices ) override;
-virtual VclPtr CreateScDeleteCellDlg(vcl::Window*
pParent, bool bDisallowCellMove ) override;
+virtual VclPtr
CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove ) override;
//for dataform
virtual VclPtr CreateScDataFormDlg(vcl::Window*
pParent,
diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx
index cdf57f5a9373..3a140bfe6dca 100644
--- a/sc/source/
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/SignSignatureLineDialog.cxx |5 -
cui/source/dialogs/SignatureLineDialog.cxx |4 ++--
cui/source/dialogs/SignatureLineDialogBase.cxx |5 +
cui/source/inc/SignSignatureLineDialog.hxx |1 -
cui/source/inc/SignatureLineDialogBase.hxx |1 +
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit ee79612fc7f33d87f6cc722cdd3e669eaa79bd98
Author: Samuel Mehrbrodt
Date: Fri Apr 13 10:55:09 2018 +0200
tdf#83877 Make user input xml safe
Change-Id: Iff1311932ef6a4525faa999553884bd8d23f3f30
Reviewed-on: https://gerrit.libreoffice.org/52814
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 94366aa34f5c..3c3052901c26 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -148,9 +148,4 @@ void SignSignatureLineDialog::Apply()
m_xShapeProperties->setPropertyValue("Graphic", Any(xGraphic));
}
-OUString SignSignatureLineDialog::getCDataString(const OUString& rString)
-{
-return "";
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/cui/source/dialogs/SignatureLineDialog.cxx
b/cui/source/dialogs/SignatureLineDialog.cxx
index ee98a98b37c2..a1716fe282b6 100644
--- a/cui/source/dialogs/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -101,8 +101,8 @@ void SignatureLineDialog::Apply()
// Read svg and replace placeholder texts
OUString aSvgImage(getSignatureImage());
-aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]", aSignerName);
-aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", aSignerTitle);
+aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]",
getCDataString(aSignerName));
+aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]",
getCDataString(aSignerTitle));
// These are only filled if the signature line is signed.
aSvgImage = aSvgImage.replaceAll("[SIGNATURE]", "");
diff --git a/cui/source/dialogs/SignatureLineDialogBase.cxx
b/cui/source/dialogs/SignatureLineDialogBase.cxx
index 894694784d35..dcd05d6ee504 100644
--- a/cui/source/dialogs/SignatureLineDialogBase.cxx
+++ b/cui/source/dialogs/SignatureLineDialogBase.cxx
@@ -30,6 +30,11 @@ short SignatureLineDialogBase::execute()
return nRet;
}
+OUString SignatureLineDialogBase::getCDataString(const OUString& rString)
+{
+return "";
+}
+
OUString SignatureLineDialogBase::getSignatureImage()
{
OUString const svg(
diff --git a/cui/source/inc/SignSignatureLineDialog.hxx
b/cui/source/inc/SignSignatureLineDialog.hxx
index 7847c70f059f..c7a6e565bd7b 100644
--- a/cui/source/inc/SignSignatureLineDialog.hxx
+++ b/cui/source/inc/SignSignatureLineDialog.hxx
@@ -35,7 +35,6 @@ private:
void ValidateFields();
virtual void Apply() override;
-OUString getCDataString(const OUString& rString);
DECL_LINK(chooseCertificate, weld::Button&, void);
};
diff --git a/cui/source/inc/SignatureLineDialogBase.hxx
b/cui/source/inc/SignatureLineDialogBase.hxx
index 34496344801a..8954ecd98a60 100644
--- a/cui/source/inc/SignatureLineDialogBase.hxx
+++ b/cui/source/inc/SignatureLineDialogBase.hxx
@@ -26,6 +26,7 @@ protected:
css::uno::Reference m_xModel;
OUString getSignatureImage();
virtual void Apply() = 0;
+OUString getCDataString(const OUString& rString);
};
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: winaccessibility/source
winaccessibility/source/service/AccObjectContainerEventListener.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 39f1c0cd1dcaa4c0caed15355b4ff8163c14f1d6
Author: Andrea Gelmini
Date: Sun Apr 1 21:22:24 2018 +0200
Fix typo
Change-Id: I89ac6de226549c6ec7d7781911ed4f4f045527cf
Reviewed-on: https://gerrit.libreoffice.org/52281
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git
a/winaccessibility/source/service/AccObjectContainerEventListener.cxx
b/winaccessibility/source/service/AccObjectContainerEventListener.cxx
index 9e9751662509..ccda6df4e57f 100644
--- a/winaccessibility/source/service/AccObjectContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccObjectContainerEventListener.cxx
@@ -60,7 +60,7 @@ void
AccObjectContainerEventListener::HandleStateChangedEvent(Any oldValue, Any
}
/**
* handle the VISIBLE_DATA_CHANGED event
- * For SHAPES, the visiable_data_changed event should be mapped to
LOCATION_CHANGED event
+ * For SHAPES, the visible_data_changed event should be mapped to
LOCATION_CHANGED event
*/
void AccObjectContainerEventListener::HandleVisibleDataChangedEvent()
{
___
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/uiconfig sfx2/uiconfig
sc/inc/scabstdlg.hxx|4 +-
sc/source/ui/attrdlg/scdlgfact.cxx | 17 +---
sc/source/ui/attrdlg/scdlgfact.hxx | 12 --
sc/source/ui/inc/inscldlg.hxx | 17 +++-
sc/source/ui/miscdlgs/inscldlg.cxx | 69 ++--
sc/source/ui/view/cellsh1.cxx |2 -
sc/uiconfig/scalc/ui/insertcells.ui | 14 ---
sfx2/uiconfig/ui/bookmarkdialog.ui |5 --
8 files changed, 76 insertions(+), 64 deletions(-)
New commits:
commit 03a59d9f43c3bbe80e1f06b1a95afd4694ac2f50
Author: Caolán McNamara
Date: Fri Apr 13 12:20:13 2018 +0100
weld ScInsertCellDlg
Change-Id: I91118d4c0c5e2fa17fed02377547caa65e11bfdc
Reviewed-on: https://gerrit.libreoffice.org/52824
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index ccdd419f2a69..d970cac36827 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -443,8 +443,8 @@ public:
virtual VclPtr CreateAbstractScGroupDlg( vcl::Window*
pParent,
bool bUnGroup =
false ) = 0;
-virtual VclPtr CreateScInsertCellDlg(
vcl::Window* pParent,
- bool
bDisallowCellMove ) = 0;
+virtual VclPtr
CreateScInsertCellDlg(weld::Window* pParent,
+ bool
bDisallowCellMove) = 0;
virtual VclPtr CreateScInsertContentsDlg(
vcl::Window*pParent,
const
OUString* pStrTitle = nullptr ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 101ad4c56d96..2c7c7eb2ebba 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -88,7 +88,12 @@ IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScInsertCellDlg_Impl);
+
+short AbstractScInsertCellDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
IMPL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScInsertTableDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScSelEntryDlg_Impl);
@@ -113,6 +118,7 @@ IMPL_ABSTDLG_BASE(ScAbstractTabDialog_Impl);
AbstractScLinkedAreaDlg_Impl::~AbstractScLinkedAreaDlg_Impl()
{
}
+
short AbstractScLinkedAreaDlg_Impl::Execute()
{
return m_xDlg->run();
@@ -296,7 +302,7 @@ bool AbstractScGroupDlg_Impl::GetColsChecked() const
InsCellCmd AbstractScInsertCellDlg_Impl::GetInsCellCmd() const
{
-return pDlg->GetInsCellCmd();
+return m_xDlg->GetInsCellCmd();
}
InsertDeleteFlags AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits()
const
@@ -714,11 +720,10 @@ VclPtr
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDl
return VclPtr::Create( pDlg );
}
-VclPtr
ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( vcl::Window* pParent,
-bool
bDisallowCellMove )
+VclPtr
ScAbstractDialogFactory_Impl::CreateScInsertCellDlg(weld::Window* pParent,
+bool
bDisallowCellMove)
{
-VclPtr pDlg = VclPtr::Create( pParent,
bDisallowCellMove);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
ScInsertCellDlg(pParent, bDisallowCellMove));
}
VclPtr
ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( vcl::Window*
pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 86cf786de353..1f2bcee38bce 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -200,7 +200,13 @@ class AbstractScGroupDlg_Impl : public AbstractScGroupDlg
class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg
{
-DECL_ABSTDLG_BASE( AbstractScInsertCellDlg_Impl, ScInsertCellDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScInsertCellDlg_Impl(ScInsertCellDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
virtual InsCellCmd GetInsCellCmd() const override ;
};
@@ -449,8 +455,8 @@ public:
virtual VclPtr CreateAbstractScGroupDlg( vcl::Window*
pParent,
bool bUnGroup =
false) override;
-virtual VclPtr CreateScInsertCellDlg(
vcl::Window* pParent,
- bool
bDisallowCellMove ) override;
+virtual VclPtr
CreateScInsertCellDlg(weld::Window* pParent,
+ bool
bDisallowCellMove) override;
virtual VclPtr CreateScInsertContentsDlg(
vcl::Window*pParent,
[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - 3 commits - vcl/unx
Rebased ref, commits from common ancestor:
commit fcfea920058b32c455a7624bc5c6ccfec67159b6
Author: Katarina Behrens
Date: Fri Apr 13 15:18:42 2018 +0200
Use Acquire/ReleaseGraphics from base class
also use SalFrame as argument and retval of CreateFrame
Change-Id: Ie5d15ee672aaa60279db5d7ad0743d3ac0037ec1
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index a6ac52350da5..ffee47165a37 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -310,20 +310,6 @@ void KDE5SalFrame::UpdateSettings( AllSettings& rSettings )
rSettings.SetStyleSettings( style );
}
-void KDE5SalFrame::ReleaseGraphics( SalGraphics *pGraphics )
-{
-for( int i = 0; i < nMaxGraphics; i++ )
-{
-if( m_aGraphics[i].pGraphics.get() == pGraphics )
-{
-m_aGraphics[i].bInUse = false;
-if ( m_aGraphics[i].pSurface != nullptr )
-cairo_surface_destroy( m_aGraphics[i].pSurface );
-break;
-}
-}
-}
-
void KDE5SalFrame::updateGraphics( bool bClear )
{
vcl::Window* pWindow = GetWindow();
@@ -334,33 +320,6 @@ void KDE5SalFrame::updateGraphics( bool bClear )
}
}
-SalGraphics* KDE5SalFrame::AcquireGraphics()
-{
-if( GetWindow() )
-{
-basegfx::B2IVector aSize( 142, 142 );
-for( int i = 0; i < nMaxGraphics; i++ )
-{
-if( ! m_aGraphics[i].bInUse )
-{
-m_aGraphics[i].bInUse = true;
-if( ! m_aGraphics[i].pGraphics )
-{
-m_aGraphics[i].pGraphics.reset( new KDE5SalGraphics( this,
m_pWindow ) );
-
-//FIXME: those parameters are completely arbitrary, IDK
what the right ones should be yet
-m_aGraphics[i].pSurface = cairo_image_surface_create(
CAIRO_FORMAT_ARGB32, aSize.getX(), aSize.getY() );
-m_aGraphics[i].pGraphics->setSurface(
m_aGraphics[i].pSurface, aSize );
-//m_aGraphics[i].pGraphics->Init( this, GetWindow(),
GetScreenNumber() );
-}
-return m_aGraphics[i].pGraphics.get();
-}
-}
-}
-
-return nullptr;
-}
-
cairo_t* KDE5SalFrame::getCairoContext() const
{
for( int i = 0; i < nMaxGraphics; i++ )
diff --git a/vcl/unx/kde5/KDE5SalFrame.hxx b/vcl/unx/kde5/KDE5SalFrame.hxx
index 3be72142ab95..c939141ec4e0 100644
--- a/vcl/unx/kde5/KDE5SalFrame.hxx
+++ b/vcl/unx/kde5/KDE5SalFrame.hxx
@@ -54,8 +54,6 @@ class KDE5SalFrame : public Qt5Frame
public:
KDE5SalFrame( KDE5SalFrame* pParent, SalFrameStyleFlags nStyle, bool
bUseCairo );
-virtual SalGraphics* AcquireGraphics() override;
-virtual void ReleaseGraphics( SalGraphics *pGraphics ) override;
void updateGraphics( bool bClear );
virtual void UpdateSettings( AllSettings& rSettings ) override;
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index dcf167312a75..7170dfca5da9 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -42,9 +42,9 @@ KDE5SalInstance::KDE5SalInstance(SalYieldMutex* pMutex)
pSVData->maAppData.mpToolkitName = new OUString("kde5");
}
-KDE5SalFrame* KDE5SalInstance::CreateFrame( KDE5SalFrame *pParent,
SalFrameStyleFlags nState )
+SalFrame* KDE5SalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags
nState )
{
-return new KDE5SalFrame( pParent, nState, true );
+return new KDE5SalFrame( static_cast(pParent), nState, true
);
}
uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker(
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 74d36e94b297..b0d940204cc0 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -30,7 +30,7 @@ class KDE5SalInstance : public Qt5Instance
{
public:
explicit KDE5SalInstance(SalYieldMutex* pMutex);
-virtual KDE5SalFrame* CreateFrame( KDE5SalFrame* pParent,
SalFrameStyleFlags nStyle );
+virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags
nStyle );
virtual bool hasNativeFileSelection() const override { return true; }
commit 1de1cbfd045db3f3a927b043372bdd6d3cc1032f
Author: Katarina Behrens
Date: Wed Apr 11 15:50:35 2018 +0200
Remove some virtual funcs implemented in the base class
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index 2938a7b69fe0..a6ac52350da5 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -52,17 +52,6 @@ KDE5SalFrame::KDE5SalFrame( KDE5SalFrame* pParent,
SalFrameStyleFlags nState, bo
{
}
-void KDE5SalFrame::Show( bool bVisible, bool bNoActivate )
-{
-if ( !GetParent() /*&& ! (GetStyle() & SalFrameStyleFlags::INTRO)*/ )
-{
-KDE5XLib* pXLib = new
KDE5XLib();//static_cast(GetDisplay()->GetXLib());
-pXLib->doStartup();
-}
-
-
[Libreoffice-commits] core.git: sfx2/source vcl/source
sfx2/source/appl/sfxhelp.cxx |5 +++--
vcl/source/window/builder.cxx |4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit dab87ec9ac4ac0e4803790232d8b487e1500f24a
Author: Caolán McNamara
Date: Fri Apr 13 10:40:34 2018 +0100
PRODUCTNAME not expanded in help missing dialog
Change-Id: I6fb0e64566eacadc963f1b7ff570e021abe29522
Reviewed-on: https://gerrit.libreoffice.org/52817
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index d4d55e99ea4b..43606ae0183e 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -827,8 +827,9 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow, const
LanguageTag aLangTag = Application::GetSettings().GetUILanguageTag();
OUString sLocaleString = SvtLanguageTable::GetLanguageString(
aLangTag.getLanguageType() );
-OUString sPrimTex = xQueryBox->get_primary_text();
-xQueryBox->set_primary_text(sPrimTex.replaceAll("$UILOCALE",
sLocaleString));
+OUString sPrimText = xQueryBox->get_primary_text();
+
xQueryBox->set_primary_text(Translate::GetReadStringHook()(sPrimText).replaceAll("$UILOCALE",
sLocaleString));
+
xQueryBox->set_title(Translate::GetReadStringHook()(xQueryBox->get_title()));
short OnlineHelpBox = xQueryBox->run();
if(OnlineHelpBox == RET_OK)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 167094a3abe1..db9bfef526e2 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2604,7 +2604,7 @@ std::vector
VclBuilder::handleItems(xmlreader::XmlReader &reader) cons
else
sFinalValue = OUString::fromUtf8(sValue);
-if (m_pStringReplace)
+if (m_bLegacy && m_pStringReplace)
sFinalValue = (*m_pStringReplace)(sFinalValue);
aItems.push_back(sFinalValue);
@@ -3349,7 +3349,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader
&reader, stringmap &rMap)
if (!sProperty.isEmpty())
{
sProperty = sProperty.replace('_', '-');
-if (m_pStringReplace)
+if (m_bLegacy && m_pStringReplace)
sFinalValue = (*m_pStringReplace)(sFinalValue);
rMap[sProperty] = sFinalValue;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/errormessages.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit faa9e4b4d9a42d6ea68475bce7d9d16de9935dff
Author: Jan Holesovsky
Date: Fri Apr 13 13:41:58 2018 +0200
Improve an unhelpful error message.
Change-Id: I79b8bb590c98da5b7290b925f7bb63dc3f777ddc
Reviewed-on: https://gerrit.libreoffice.org/52827
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index bdad9bb96..1f1454208 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -5,7 +5,7 @@ exports.infoandsupport = _('More information and support');
exports.limitreachedprod = _('This service is limited to %0 documents, and %1
connections total by the admin. This limit has been reached. Please try again
later.');
exports.serviceunavailable = _('Service is unavailable. Please try again later
and report to your administrator if the issue persists.');
exports.unauthorized = _('Unauthorized WOPI host. Please try again later and
report to your administrator if the issue persists.');
-exports.wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or
file_path, usage: file_path=/path/to/doc/');
+exports.wrongwopisrc = _('Wrong or missing WOPISrc parameter, please contact
support.');
exports.sessionexpiry = _('Your session will expire in %time. Please save your
work and refresh the session (or webpage) to continue.');
exports.sessionexpired = _('Your session has been expired. Further changes to
document might not be saved. Please refresh the session (or webpage) to
continue.');
exports.faileddocloading = _('Failed to load the document. Please ensure the
file type is supported and not corrupted, and try again.');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source
cui/Library_cui.mk |1
cui/source/dialogs/SignSignatureLineDialog.cxx | 191 --
cui/source/dialogs/SignatureLineDialog.cxx | 189 --
cui/source/dialogs/SignatureLineDialogBase.cxx | 211 +
cui/source/inc/SignSignatureLineDialog.hxx | 10 -
cui/source/inc/SignatureLineDialog.hxx | 10 -
cui/source/inc/SignatureLineDialogBase.hxx | 33 +++
7 files changed, 254 insertions(+), 391 deletions(-)
New commits:
commit 53cc801ed93e4aa76c67ce6aeb0333a56049a1c1
Author: Samuel Mehrbrodt
Date: Thu Apr 12 17:29:56 2018 +0200
tdf#83877 Signatureline dialog: Move shared stuff to common base
Change-Id: I0af888f7b8cd3b7d58665a4b0b1ef18a7f9e98c2
Reviewed-on: https://gerrit.libreoffice.org/52788
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 877cd1182811..44bac812c557 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -121,6 +121,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/pastedlg \
cui/source/dialogs/postdlg \
cui/source/dialogs/scriptdlg \
+cui/source/dialogs/SignatureLineDialogBase \
cui/source/dialogs/SignatureLineDialog \
cui/source/dialogs/SignSignatureLineDialog \
cui/source/dialogs/sdrcelldlg \
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 94bb4497e93b..94366aa34f5c 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -47,17 +47,16 @@ using namespace css::graphic;
using namespace css::security;
SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent,
Reference xModel)
-: GenericDialogController(pParent, "cui/ui/signsignatureline.ui",
"SignSignatureLineDialog")
+: SignatureLineDialogBase(pParent, xModel, "cui/ui/signsignatureline.ui",
+ "SignSignatureLineDialog")
, m_xEditName(m_xBuilder->weld_entry("edit_name"))
, m_xEditComment(m_xBuilder->weld_text_view("edit_comment"))
,
m_xBtnChooseCertificate(m_xBuilder->weld_button("btn_select_certificate"))
, m_xBtnSign(m_xBuilder->weld_button("ok"))
-, m_xModel(xModel)
{
Reference
xIndexAccess(m_xModel->getCurrentSelection(),
UNO_QUERY_THROW);
m_xShapeProperties.set(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
-//m_xShapeProperties = xProps;
bool bIsSignatureLine;
m_xShapeProperties->getPropertyValue("IsSignatureLine") >>=
bIsSignatureLine;
@@ -90,14 +89,6 @@
SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc
ValidateFields();
}
-short SignSignatureLineDialog::execute()
-{
-short nRet = run();
-if (nRet == RET_OK)
-Apply();
-return nRet;
-}
-
IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate, weld::Button&,
void)
{
Reference
xSigner(DocumentDigitalSignatures::createWithVersion(
@@ -162,182 +153,4 @@ OUString SignSignatureLineDialog::getCDataString(const
OUString& rString)
return "";
}
-OUString SignSignatureLineDialog::getSignatureImage()
-{
-OUString const svg(
-"http://purl.org/dc/elements/1.1/\";
xmlns:cc=\"http://creativecommons.org/ns#\"; "
-"xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"; "
-"xmlns:svg=\"http://www.w3.org/2000/svg\";
xmlns=\"http://www.w3.org/2000/svg\"; "
-"xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\";
"
-"xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\";
version=\"1.2\" "
-"width=\"90mm\" height=\"45mm\" viewBox=\"0 0 9000 4500\"
preserveAspectRatio=\"xMidYMid\" "
-"fill-rule=\"evenodd\" stroke-width=\"28.222\"
stroke-linejoin=\"round\" "
-"xml:space=\"preserve\" id=\"svg577\" inkscape:version=\"0.92.2
(5c3e80d, "
-"2017-08-06)\">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage\"/>150139132512: "
-"XPATHSTROKE_SEQ_BEGIN132133109512:
XPATHSTROKE_SEQ_END14015013913313240150512: "
-"XTEXT_PAINTSHAPE_BEGIN138136135134113type: Text; content: "
-"[SIGNATURE]; [SIGNATURE]512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOW512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOW512: XTEXT_EOL512:
XTEXT_EOP512:
XTEXT_PAINTSHAPE_END150512: "
-"XTEXT_PAINTSHAPE_BEGIN138136135134113type: Text; content: "
-"[SIGNER_NAME]; [SIGNER_NAME]512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOW512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOC512: XTEXT_EOC512:
XTEXT_EOW512: XTEXT_EOL512:
XTEXT_EOP512:
XTEXT_PAINTSHAPE_END150512: "
-"XTEXT_PAINTSHA
[Libreoffice-commits] core.git: cui/source sw/qa
cui/source/dialogs/SignatureLineDialog.cxx |6 +-
sw/qa/uitest/writer_tests/insertSignatureLine.py |8
2 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit f4b5a16688f63f5ab7f8b058d2cb3416ebfe84c4
Author: Samuel Mehrbrodt
Date: Thu Apr 12 16:26:48 2018 +0200
tdf#83877 SignatureLineDialog: Improve default values
Change-Id: Ie9da98870f1b6722c6e03b48db94bd448092ad34
Reviewed-on: https://gerrit.libreoffice.org/52782
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/dialogs/SignatureLineDialog.cxx
b/cui/source/dialogs/SignatureLineDialog.cxx
index bd2e79f9b961..87448c066b7b 100644
--- a/cui/source/dialogs/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -51,9 +51,13 @@ SignatureLineDialog::SignatureLineDialog(weld::Widget*
pParent, Referenceset_size_request(m_xEditInstructions->get_approximate_digit_width()
* 48,
m_xEditInstructions->get_text_height() * 5);
-// No signature line selected - start with empty dialog and generate a new
one
+// No signature line selected - start with empty dialog and set some
default values
if (!bEditExisting)
+{
+m_xCheckboxCanAddComments->set_active(true);
+m_xCheckboxShowSignDate->set_active(true);
return;
+}
Reference
xIndexAccess(m_xModel->getCurrentSelection(),
UNO_QUERY_THROW);
diff --git a/sw/qa/uitest/writer_tests/insertSignatureLine.py
b/sw/qa/uitest/writer_tests/insertSignatureLine.py
index 118e0f8c44a0..c4a021d4b464 100644
--- a/sw/qa/uitest/writer_tests/insertSignatureLine.py
+++ b/sw/qa/uitest/writer_tests/insertSignatureLine.py
@@ -39,8 +39,8 @@ class insertSignatureLine(UITestCase):
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineSuggestedSignerTitle,
"Title")
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineSuggestedSignerEmail,
"Email")
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineSuggestedSignerTitle,
"Title")
-
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineCanAddComment,
True)
-
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineShowSignDate,
False)
+
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineCanAddComment,
False)
+
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineShowSignDate,
True)
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineSigningInstructions,
"Instructions")
self.ui_test.close_doc()
@@ -75,8 +75,8 @@ class insertSignatureLine(UITestCase):
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineSuggestedSignerTitle,
"Title")
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineSuggestedSignerEmail,
"Email")
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineSuggestedSignerTitle,
"Title")
-
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineCanAddComment,
True)
-
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineShowSignDate,
True)
+
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineCanAddComment,
False)
+
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineShowSignDate,
False)
self.assertEqual(document.DrawPage.getByIndex(0).SignatureLineSigningInstructions,
"Instructions")
self.ui_test.close_doc()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx include/vcl svx/Library_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk sw/inc sw/source
cui/Library_cui.mk |1 +
cui/UIConfig_cui.mk|1 +
cui/source/dialogs/SignatureLineDialog.cxx |4 ++--
cui/source/factory/cuiexp.cxx |1 +
cui/source/factory/dlgfact.cxx | 13 +
cui/source/factory/dlgfact.hxx | 18 ++
cui/source/inc/SignatureLineDialog.hxx |7 +++
include/vcl/abstdlg.hxx| 13 +
svx/Library_svx.mk |1 -
svx/UIConfig_svx.mk|1 -
sw/inc/swabstdlg.hxx |4
sw/source/ui/dialog/swdlgfact.cxx | 13 -
sw/source/ui/dialog/swdlgfact.hxx | 17 -
sw/source/ui/dialog/swuiexp.cxx|1 -
sw/source/uibase/uiview/viewdlg2.cxx |9 -
15 files changed, 56 insertions(+), 48 deletions(-)
New commits:
commit 6f6f37b7a48e30b976eb1806364c83b69047cab9
Author: Samuel Mehrbrodt
Date: Thu Apr 12 16:18:37 2018 +0200
tdf#83877 Move SignatureLineDialog to cui
next to SignSignatureLineDialog
Change-Id: I26efa96ec6dae4d9e091abc8cafd9b841118ef31
Reviewed-on: https://gerrit.libreoffice.org/52781
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index afa01ef24a96..877cd1182811 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -121,6 +121,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/pastedlg \
cui/source/dialogs/postdlg \
cui/source/dialogs/scriptdlg \
+cui/source/dialogs/SignatureLineDialog \
cui/source/dialogs/SignSignatureLineDialog \
cui/source/dialogs/sdrcelldlg \
cui/source/dialogs/showcols \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8bf3c3073d06..be4a3ac180a8 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -180,6 +180,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/shadowtabpage \
cui/uiconfig/ui/showcoldialog \
cui/uiconfig/ui/similaritysearchdialog \
+ cui/uiconfig/ui/signatureline \
cui/uiconfig/ui/signsignatureline \
cui/uiconfig/ui/slantcornertabpage \
cui/uiconfig/ui/smarttagoptionspage \
diff --git a/svx/source/dialog/SignatureLineDialog.cxx
b/cui/source/dialogs/SignatureLineDialog.cxx
similarity index 99%
rename from svx/source/dialog/SignatureLineDialog.cxx
rename to cui/source/dialogs/SignatureLineDialog.cxx
index 41fe582714a9..bd2e79f9b961 100644
--- a/svx/source/dialog/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include
+#include
#include
#include
@@ -39,7 +39,7 @@ using namespace css::graphic;
SignatureLineDialog::SignatureLineDialog(weld::Widget* pParent,
Reference xModel,
bool bEditExisting)
-: GenericDialogController(pParent, "svx/ui/signatureline.ui",
"SignatureLineDialog")
+: GenericDialogController(pParent, "cui/ui/signatureline.ui",
"SignatureLineDialog")
, m_xEditName(m_xBuilder->weld_entry("edit_name"))
, m_xEditTitle(m_xBuilder->weld_entry("edit_title"))
, m_xEditEmail(m_xBuilder->weld_entry("edit_email"))
diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx
index 104293936dec..c52f11f857be 100644
--- a/cui/source/factory/cuiexp.cxx
+++ b/cui/source/factory/cuiexp.cxx
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 5157aae3b303..a1cc05f2603d 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -60,6 +60,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -192,6 +193,11 @@ void AbstractSvxCharacterMapDialog_Impl::SetText(const
OUString& rStr)
m_xDlg->set_title(rStr);
}
+short AbstractSignatureLineDialog_Impl::Execute()
+{
+return m_xDlg->execute();
+}
+
short AbstractSignSignatureLineDialog_Impl::Execute()
{
return m_xDlg->execute();
@@ -1575,6 +1581,13 @@ VclPtr
AbstractDialogFactory_Impl::CreateScreen
return VclPtr::Create(pDlg);
}
+VclPtr
AbstractDialogFactory_Impl::CreateSignatureLineDialog(
+weld::Window* pParent, const Reference xModel, bool bEditExisting)
+{
+return VclPtr::Create(
+new SignatureLineDialog(pParent, xModel, bEditExisting));
+}
+
VclPtr
AbstractDialogFactory_Impl::CreateSignSignatureLineDialog(weld::Window*
pParent,
const
Reference xModel)
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index a5f26ee47a48..df1eb99129c7 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -533,6 +533,20 @@ class Abs
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig
sfx2/source/appl/newhelp.cxx | 44 ++---
sfx2/source/appl/newhelp.hxx | 12 +-
sfx2/uiconfig/ui/bookmarkdialog.ui | 34 +---
3 files changed, 44 insertions(+), 46 deletions(-)
New commits:
commit 167dea2eacd6cabfc65c6c756a14a62b58b7f206
Author: Caolán McNamara
Date: Fri Apr 13 12:04:10 2018 +0100
weld SfxAddHelpBookmarkDialog
Change-Id: I3724b0e92cfd3103f7ecdadbcf6c1efc501e6c04
Reviewed-on: https://gerrit.libreoffice.org/52822
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 47f5a4c09c77..b5dd4b791d97 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1185,15 +1185,15 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
sal_Int32 nPos = GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
-ScopedVclPtrInstance< SfxAddHelpBookmarkDialog_Impl >
aDlg(this, true);
-aDlg->SetTitle( GetEntry( nPos ) );
-if ( aDlg->Execute() == RET_OK )
+SfxAddHelpBookmarkDialog_Impl aDlg(GetFrameWeld(), true);
+aDlg.SetTitle(GetEntry(nPos));
+if (aDlg.run() == RET_OK)
{
OUString* pURL = static_cast(GetEntryData( nPos
));
RemoveEntry( nPos );
OUString aImageURL = IMAGE_URL;
aImageURL += INetURLObject( *pURL ).GetHost();
-nPos = InsertEntry( aDlg->GetTitle(),
SvFileInformationManager::GetImage( INetURLObject(aImageURL) ) );
+nPos = InsertEntry( aDlg.GetTitle(),
SvFileInformationManager::GetImage( INetURLObject(aImageURL) ) );
SetEntryData( nPos, new OUString( *pURL ) );
SelectEntryPos( nPos );
delete pURL;
@@ -3099,12 +3099,12 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId
)
OUString aValue;
if ( aAny >>= aValue )
{
-OUString aTitle( aValue );
-ScopedVclPtrInstance<
SfxAddHelpBookmarkDialog_Impl > aDlg(this, false);
-aDlg->SetTitle( aTitle );
-if ( aDlg->Execute() == RET_OK )
+OUString aTitle(aValue);
+SfxAddHelpBookmarkDialog_Impl aDlg(GetFrameWeld(),
false);
+aDlg.SetTitle(aTitle);
+if (aDlg.run() == RET_OK )
{
-aTitle = aDlg->GetTitle();
+aTitle = aDlg.GetTitle();
pIndexWin->AddBookmarks( aTitle, aURL );
}
}
@@ -3167,29 +3167,19 @@ bool SfxHelpWindow_Impl::HasHistorySuccessor() const
// class SfxAddHelpBookmarkDialog_Impl ---
-SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window*
pParent, bool bRename)
-: ModalDialog( pParent, "BookmarkDialog", "sfx/ui/bookmarkdialog.ui")
+SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(weld::Window*
pParent, bool bRename)
+: GenericDialogController(pParent, "sfx/ui/bookmarkdialog.ui",
"BookmarkDialog")
+, m_xTitleED(m_xBuilder->weld_entry("entry"))
+, m_xAltTitle(m_xBuilder->weld_label("alttitle"))
{
-get(m_pTitleED, "entry");
if (bRename)
-SetText(get("alttitle")->GetText());
+m_xDialog->set_title(m_xAltTitle->get_label());
}
-SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl()
+void SfxAddHelpBookmarkDialog_Impl::SetTitle(const OUString& rTitle)
{
-disposeOnce();
-}
-
-void SfxAddHelpBookmarkDialog_Impl::dispose()
-{
-m_pTitleED.clear();
-ModalDialog::dispose();
-}
-
-void SfxAddHelpBookmarkDialog_Impl::SetTitle( const OUString& rTitle )
-{
-m_pTitleED->SetText( rTitle );
-m_pTitleED->SetSelection( Selection( 0, rTitle.getLength() ) );
+m_xTitleED->set_text(rTitle);
+m_xTitleED->select_region(0, -1);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index b5388a3af315..4c6d4818910a 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -563,17 +564,16 @@ public:
bool bAddToHistory =
true);
};
-class SfxAddHelpBookmarkDialog_Impl : public ModalDialog
+class SfxAddHelpBookmarkDialog_Impl : public weld::GenericDialogController
{
private:
-VclPtr m_pTitleED;
+std::unique_ptr m_xTitleED;
+std::
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source sfx2/uiconfig
include/sfx2/templatedlg.hxx| 24 +++
sfx2/source/dialog/dinfdlg.cxx | 104 +++---
sfx2/source/doc/templatedlg.cxx | 109 +---
sfx2/uiconfig/ui/editdurationdialog.ui | 71 ++--
sfx2/uiconfig/ui/templatecategorydlg.ui | 60 +
5 files changed, 208 insertions(+), 160 deletions(-)
New commits:
commit a27f1957e574f03734fd4b4419f0b0f0229549f1
Author: Caolán McNamara
Date: Fri Apr 13 11:54:50 2018 +0100
weld DurationDialog
Change-Id: If69c4259c3fd40c822a2dd505e51059a805813f4
Reviewed-on: https://gerrit.libreoffice.org/52821
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index d0f87eda0829..cda6becfc1ab 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1255,78 +1255,54 @@ void CustomPropertiesYesNoButton::dispose()
Control::dispose();
}
-class DurationDialog_Impl : public ModalDialog
+class DurationDialog_Impl : public weld::GenericDialogController
{
-VclPtr m_pNegativeCB;
-VclPtr m_pYearNF;
-VclPtr m_pMonthNF;
-VclPtr m_pDayNF;
-VclPtr m_pHourNF;
-VclPtr m_pMinuteNF;
-VclPtr m_pSecondNF;
-VclPtr m_pMSecondNF;
+std::unique_ptr m_xNegativeCB;
+std::unique_ptr m_xYearNF;
+std::unique_ptr m_xMonthNF;
+std::unique_ptr m_xDayNF;
+std::unique_ptr m_xHourNF;
+std::unique_ptr m_xMinuteNF;
+std::unique_ptr m_xSecondNF;
+std::unique_ptr m_xMSecondNF;
public:
-
-DurationDialog_Impl( vcl::Window* pParent, const util::Duration& rDuration
);
-virtual ~DurationDialog_Impl() override;
-virtual void dispose() override;
+DurationDialog_Impl(weld::Window* pParent, const util::Duration&
rDuration);
util::Duration GetDuration() const;
};
-DurationDialog_Impl::DurationDialog_Impl(vcl::Window* pParent,
-const util::Duration& rDuration)
-: ModalDialog(pParent, "EditDurationDialog",
-"sfx/ui/editdurationdialog.ui")
-{
-get(m_pNegativeCB, "negative");
-get(m_pYearNF, "years");
-get(m_pMonthNF, "months");
-get(m_pDayNF, "days");
-get(m_pHourNF, "hours");
-get(m_pMinuteNF, "minutes");
-get(m_pSecondNF, "seconds");
-get(m_pMSecondNF, "milliseconds");
-
-m_pNegativeCB->Check(rDuration.Negative);
-m_pYearNF->SetValue(rDuration.Years);
-m_pMonthNF->SetValue(rDuration.Months);
-m_pDayNF->SetValue(rDuration.Days);
-m_pHourNF->SetValue(rDuration.Hours);
-m_pMinuteNF->SetValue(rDuration.Minutes);
-m_pSecondNF->SetValue(rDuration.Seconds);
-m_pMSecondNF->SetValue(rDuration.NanoSeconds);
-}
-
-DurationDialog_Impl::~DurationDialog_Impl()
-{
-disposeOnce();
-}
-
-void DurationDialog_Impl::dispose()
-{
-m_pNegativeCB.clear();
-m_pYearNF.clear();
-m_pMonthNF.clear();
-m_pDayNF.clear();
-m_pHourNF.clear();
-m_pMinuteNF.clear();
-m_pSecondNF.clear();
-m_pMSecondNF.clear();
-ModalDialog::dispose();
+DurationDialog_Impl::DurationDialog_Impl(weld::Window* pParent, const
util::Duration& rDuration)
+: GenericDialogController(pParent, "sfx/ui/editdurationdialog.ui",
"EditDurationDialog")
+, m_xNegativeCB(m_xBuilder->weld_check_button("negative"))
+, m_xYearNF(m_xBuilder->weld_spin_button("years"))
+, m_xMonthNF(m_xBuilder->weld_spin_button("months"))
+, m_xDayNF(m_xBuilder->weld_spin_button("days"))
+, m_xHourNF(m_xBuilder->weld_spin_button("hours"))
+, m_xMinuteNF(m_xBuilder->weld_spin_button("minutes"))
+, m_xSecondNF(m_xBuilder->weld_spin_button("seconds"))
+, m_xMSecondNF(m_xBuilder->weld_spin_button("milliseconds"))
+{
+m_xNegativeCB->set_active(rDuration.Negative);
+m_xYearNF->set_value(rDuration.Years);
+m_xMonthNF->set_value(rDuration.Months);
+m_xDayNF->set_value(rDuration.Days);
+m_xHourNF->set_value(rDuration.Hours);
+m_xMinuteNF->set_value(rDuration.Minutes);
+m_xSecondNF->set_value(rDuration.Seconds);
+m_xMSecondNF->set_value(rDuration.NanoSeconds);
}
util::Duration DurationDialog_Impl::GetDuration() const
{
util::Duration aRet;
-aRet.Negative = m_pNegativeCB->IsChecked();
-aRet.Years = m_pYearNF->GetValue();
-aRet.Months = m_pMonthNF->GetValue( );
-aRet.Days = m_pDayNF->GetValue( );
-aRet.Hours = m_pHourNF->GetValue( );
-aRet.Minutes = m_pMinuteNF->GetValue();
-aRet.Seconds = m_pSecondNF->GetValue();
-aRet.NanoSeconds = m_pMSecondNF->GetValue();
+aRet.Negative = m_xNegativeCB->get_active();
+aRet.Years = m_xYearNF->get_value();
+aRet.Months = m_xMonthNF->get_value();
+aRet.Days = m_xDayNF->get_value();
+aRet.Hours = m_xHourNF->get_value();
+aRet.Minutes = m_xMinuteNF->get_value();
+aRet.Seconds = m_xSecondNF->get_value();
+aRet.NanoSeconds = m_xMSecondNF->get_value
[Libreoffice-commits] core.git: 2 commits - sfx2/source sw/inc sw/source
sfx2/source/appl/workwin.cxx| 23 +-
sfx2/source/inc/workwin.hxx |2
sw/inc/editsh.hxx |3
sw/source/core/edit/edlingu.cxx | 150 ++--
4 files changed, 83 insertions(+), 95 deletions(-)
New commits:
commit f17a04df424dac553195c1922a4e4aa1f4ad5b9d
Author: Hrishabh
Date: Sat Mar 10 14:13:06 2018 +0530
tdf#39593 fixed copy paste code in sw edlingu.cxx
Change-Id: I5d4909e7c16aee488971b4793b20a5cf3ae6bddf
Reviewed-on: https://gerrit.libreoffice.org/51173
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 8b9e5662fbe6..3a7ecbd9e030 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -791,6 +791,9 @@ public:
/// Is hyphenation active somewhere else?
static bool HasHyphIter();
+void HandleCorrectionError( const OUString aText, SwPosition aPos,
+sal_Int32 nBegin, sal_Int32 nLen, SwPaM* pCursor,
+const Point* pPt, SwRect& rSelectRect );
css::uno::Reference< css::linguistic2::XSpellAlternatives >
GetCorrection( const Point* pPt, SwRect& rSelectRect );
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index c4f602ce0e36..74401bb03f05 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -815,6 +815,60 @@ void SwEditShell::HyphIgnore()
g_pHyphIter->ShowSelection();
}
+void SwEditShell::HandleCorrectionError(
+const OUString aText, SwPosition aPos, sal_Int32 nBegin,
+sal_Int32 nLen, SwPaM* pCursor,
+const Point* pPt, SwRect& rSelectRect )
+{
+// save the start and end positions of the line and the starting point
+Push();
+LeftMargin();
+const sal_Int32 nLineStart = GetCursor()->GetPoint()->nContent.GetIndex();
+RightMargin();
+const sal_Int32 nLineEnd = GetCursor()->GetPoint()->nContent.GetIndex();
+Pop(PopMode::DeleteCurrent);
+
+// make sure the selection build later from the data below does
+// not "in word" character to the left and right in order to
+// preserve those. Therefore count those "in words" in order to
+// modify the selection accordingly.
+const sal_Unicode* pChar = aText.getStr();
+sal_Int32 nLeft = 0;
+while (*pChar++ == CH_TXTATR_INWORD)
+++nLeft;
+pChar = aText.getLength() ? aText.getStr() + aText.getLength() - 1 :
nullptr;
+sal_Int32 nRight = 0;
+while (pChar && *pChar-- == CH_TXTATR_INWORD)
+++nRight;
+
+aPos.nContent = nBegin + nLeft;
+pCursor = GetCursor();
+*pCursor->GetPoint() = aPos;
+pCursor->SetMark();
+ExtendSelection( true, nLen - nLeft - nRight );
+// don't determine the rectangle in the current line
+const sal_Int32 nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart :
nBegin + nLeft;
+// take one less than the line end - otherwise the next line would be
calculated
+const sal_Int32 nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd
+? nLineEnd : (nBegin + nLen - nLeft - nRight);
+Push();
+pCursor->DeleteMark();
+SwIndex& rContent = GetCursor()->GetPoint()->nContent;
+rContent = nWordStart;
+SwRect aStartRect;
+SwCursorMoveState aState;
+aState.m_bRealWidth = true;
+SwContentNode* pContentNode = pCursor->GetContentNode();
+SwContentFrame *pContentFrame = pContentNode->getLayoutFrame( GetLayout(),
pPt, pCursor->GetPoint(), false);
+
+pContentFrame->GetCharRect( aStartRect, *pCursor->GetPoint(), &aState );
+rContent = nWordEnd - 1;
+SwRect aEndRect;
+pContentFrame->GetCharRect( aEndRect, *pCursor->GetPoint(),&aState );
+rSelectRect = aStartRect.Union( aEndRect );
+Pop(PopMode::DeleteCurrent);
+}
+
/** Get a list of potential corrections for misspelled word.
*
* If empty, word is unknown but there are no corrections available.
@@ -877,53 +931,7 @@ uno::Reference< XSpellAlternatives >
if ( xSpellAlt.is() ) // error found?
{
-// save the start and end positions of the line and the
starting point
-Push();
-LeftMargin();
-const sal_Int32 nLineStart =
GetCursor()->GetPoint()->nContent.GetIndex();
-RightMargin();
-const sal_Int32 nLineEnd =
GetCursor()->GetPoint()->nContent.GetIndex();
-Pop(PopMode::DeleteCurrent);
-
-// make sure the selection build later from the data below does
-// not "in word" character to the left and right in order to
-// preserve those. Therefore count those "in words" in order to
-// modify the selection accordingly.
-const sal_Unicode* pChar = aText.getStr();
-sal_Int32 nLeft = 0;
-while (*pChar++ == CH_TXTATR_INWORD)
-++nLeft;
-pChar = aText.getLength() ?
Hrishabh Rajput License Statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/errormessages.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3dca160c923a0afdd9ebcbb69f373b8cc82f693c
Author: Jan Holesovsky
Date: Fri Apr 13 13:41:58 2018 +0200
Improve an unhelpful error message.
Change-Id: I79b8bb590c98da5b7290b925f7bb63dc3f777ddc
Reviewed-on: https://gerrit.libreoffice.org/52826
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index bdad9bb96..1f1454208 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -5,7 +5,7 @@ exports.infoandsupport = _('More information and support');
exports.limitreachedprod = _('This service is limited to %0 documents, and %1
connections total by the admin. This limit has been reached. Please try again
later.');
exports.serviceunavailable = _('Service is unavailable. Please try again later
and report to your administrator if the issue persists.');
exports.unauthorized = _('Unauthorized WOPI host. Please try again later and
report to your administrator if the issue persists.');
-exports.wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or
file_path, usage: file_path=/path/to/doc/');
+exports.wrongwopisrc = _('Wrong or missing WOPISrc parameter, please contact
support.');
exports.sessionexpiry = _('Your session will expire in %time. Please save your
work and refresh the session (or webpage) to continue.');
exports.sessionexpired = _('Your session has been expired. Further changes to
document might not be saved. Please refresh the session (or webpage) to
continue.');
exports.faileddocloading = _('Failed to load the document. Please ensure the
file type is supported and not corrupted, and try again.');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/core/api/ReportDefinition.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9baf9a80ac267a2382aac2b6fe7e7a61528231c5 Author: Stephan Bergmann Date: Fri Apr 13 10:34:15 2018 +0200 -Werror,-Wself-assign Looks like this was a typo ever since the code's introduction in 77cc7cfa1c76b3669791f4c77cc837035c378217 "INTEGRATION: CWS rptwizard01" (and then changed again in d1ea6ecda68bf65b8d90e9ea17fa0a218a92b016 "replace <<= with assign for <<= with rhs Any"). Change-Id: I8c4fa3ddb651400b9bf65395e8b6ff946c74abf5 Reviewed-on: https://gerrit.libreoffice.org/52813 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 7226f9a1e5ab..0df0186fee5b 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1607,7 +1607,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue uno::Any aStorageSource; if ( xStream.is() ) -aStorageSource = aStorageSource; +aStorageSource <<= xStream; else if ( !sURL.isEmpty() ) aStorageSource <<= sURL; else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/polygon/b2dpolygontools.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 4bf1bf9dd4598f34e43c7c8a69f3665175c3cae5
Author: Stephan Bergmann
Date: Fri Apr 13 10:29:18 2018 +0200
-Werror,-Wself-assign
...ever since 2bd76c3928d6250c287fb8910e8843d035100e5e "INTEGRATION: CWS
aw033",
and looks like it wants to use the
aRetval = rCandidate.getB2DPoint(nIndex);
already assigned to it ahead of the if/else branches.
Change-Id: Iac242281312fe28b9a17a6a2a930e9597f77b7aa
Reviewed-on: https://gerrit.libreoffice.org/52811
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx
b/basegfx/source/polygon/b2dpolygontools.cxx
index c4499f7d352b..8457ff3044b9 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -625,7 +625,6 @@ namespace basegfx
else if(fTools::equalZero(fDistance))
{
// start point of chosen edge
-aRetval = aRetval;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.0-1'
Tag 'cp-6.0-1' created by Andras Timar at 2018-04-13 11:13 + cp-6.0-1 Changes since cp-6.0-branch-point-570: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: HSQLDB to Firebird migration bugs and "regression" keyword
Hi Lionel, Yep, it was me who added most of them. From the user point of view, as it works nowadays, it would be consider a regression, as it used to work but it doesn't anymore. What LibreOffice does internally is transparent to them. But yeah, you're right, yesterday we said we will offer the user the option to choose. I'll revert my changes. Regards El 13/04/18 a les 12:56, Lionel Elie Mamane ha escrit: > Hi, > > I don't think it is reasonable to tag all bugs in the HSQLDB to > Firebird migration as regressions. These are bugs in a new feature, so > by definition cannot be regressions. > > In the context of a mandatory migration, there is some argument to say > that they are regressions, but in case you didn't hear/read it yet, it > was agreed during the ESC call yesterday that the migration would be > _proposed_ to the user, and not launched without the user's consent. > > Best Regards, > > Lionel > -- Xisco Faulí Libreoffice QA Team IRC: x1sc0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
HSQLDB to Firebird migration bugs and "regression" keyword
Hi, I don't think it is reasonable to tag all bugs in the HSQLDB to Firebird migration as regressions. These are bugs in a new feature, so by definition cannot be regressions. In the context of a mandatory migration, there is some argument to say that they are regressions, but in case you didn't hear/read it yet, it was agreed during the ESC call yesterday that the migration would be _proposed_ to the user, and not launched without the user's consent. Best Regards, Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Nithin Kumar Padavu License Statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. To the extent possible under law, I waive all copyright and related or neighboring rights to my past & future contributions to LibreOffice: http://creativecommons.org/publicdomain/zero/1.0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-5.4.7.2'
Tag 'libreoffice-5.4.7.2' created by Andras Timar at 2018-04-13 10:30 + libreoffice-5.4.7.2 Changes since libreoffice-5.4.2.2-51: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - 2 commits - common/Util.cpp common/Util.hpp configure.ac wsd/FileServer.cpp
common/Util.cpp| 28
common/Util.hpp|8
configure.ac |2 +-
wsd/FileServer.cpp |7 +--
4 files changed, 42 insertions(+), 3 deletions(-)
New commits:
commit eb6f500a856c000e1bc30eb6302bbdf054b02a23
Author: Andras Timar
Date: Fri Apr 13 12:19:32 2018 +0200
Bump version to 5.4.7.2
Change-Id: Ie32b61cab9099ff4f0df123a5a6c850fe26bf9e8
diff --git a/configure.ac b/configure.ac
index 8aab94d7e..14a5a5b1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([libreoffice-online], [5.4.2.2], [libreoffice@lists.freedesktop.org])
+AC_INIT([libreoffice-online], [5.4.7.2], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit 18fbb1e10858013f5e3fe40254b49c9db02939c1
Author: Jan Holesovsky
Date: Wed Apr 4 12:36:11 2018 +0200
Sanity-check the scheme and host for frame ancestor, POCO does not do that.
Change-Id: Ieea9532ccd2a11e74f370a340e68f46122469848
(cherry picked from commit c8ef63253a94a4f74cc4238d7d070f75e26bec3e)
Signed-off-by: Andras Timar
diff --git a/common/Util.cpp b/common/Util.cpp
index 803ebfb06..6d9c45f06 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -321,6 +321,34 @@ namespace Util
static std::atomic_int counter(0);
return std::to_string(Poco::Process::id()) + "/" +
std::to_string(counter++);
}
+
+bool isValidURIScheme(const std::string& scheme)
+{
+if (scheme.empty())
+return false;
+
+for (char c : scheme)
+{
+if (!isalpha(c))
+return false;
+}
+
+return true;
+}
+
+bool isValidURIHost(const std::string& host)
+{
+if (host.empty())
+return false;
+
+for (char c : host)
+{
+if (!isalnum(c) && c != '_' && c != '-' && c != '.' && c !=':' &&
c != '[' && c != ']')
+return false;
+}
+
+return true;
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Util.hpp b/common/Util.hpp
index d2803a425..c86b3d940 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -203,6 +203,14 @@ namespace Util
return trimmed(std::string(s));
}
+/// Check for the URI scheme validity.
+/// For now just a basic sanity check, can be extended if necessary.
+bool isValidURIScheme(const std::string& scheme);
+
+/// Check for the URI host validity.
+/// For now just a basic sanity check, can be extended if necessary.
+bool isValidURIHost(const std::string& host);
+
/// Given one or more patterns to allow, and one or more to deny,
/// the match member will return true if, and only if, the subject
/// matches the allowed list, but not the deny.
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 49e36b568..8477794ea 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -507,9 +507,12 @@ void FileServerRequestHandler::preprocessFile(const
HTTPRequest& request, Poco::
// Keep only the origin, reject everything else
Poco::URI uriFrameAncestor(frameAncestor);
-if (!frameAncestor.empty() && !uriFrameAncestor.getScheme().empty() &&
!uriFrameAncestor.getHost().empty())
+std::string frameAncestorScheme = uriFrameAncestor.getScheme();
+std::string frameAncestorHost = uriFrameAncestor.getHost();
+
+if (!frameAncestor.empty() && Util::isValidURIScheme(frameAncestorScheme)
&& Util::isValidURIHost(frameAncestorHost))
{
-frameAncestor = uriFrameAncestor.getScheme() + "://" +
uriFrameAncestor.getHost() + ":" + std::to_string(uriFrameAncestor.getPort());
+frameAncestor = frameAncestorScheme + "://" + frameAncestorHost + ":"
+ std::to_string(uriFrameAncestor.getPort());
LOG_TRC("Final frame ancestor: " << frameAncestor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin4.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 75dba661d97c625fee8fd2b80c90b9adba9aeffb Author: Caolán McNamara Date: Thu Apr 12 14:53:20 2018 +0100 Related: tdf#100925 background not getting set under X sometimes not sure why this is the case, but it is reminiscent of rhbz#1283420 which results in missing glyphs in some circumstances X11CairoTextRender::getCairoContext has a hack in it for that problem, whic forces a read from the underlying X Drawable before writing to it which seems to have the effect of syncing it up. So, just before drawing the bg, draw a glyph on it to get it synced, and then overwrite it. Change-Id: I27e8e989b91821869d8b75a59728ac513d1b Reviewed-on: https://gerrit.libreoffice.org/52810 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 0561a41c3d9f..a808522032e8 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1021,7 +1021,12 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI } // paint the background -rDevice.DrawRect(rDevice.PixelToLogic(aBackground)); +tools::Rectangle aLogicRect(rDevice.PixelToLogic(aBackground)); +//tdf#100925, rhbz#1283420, Draw some text here, to get +//X11CairoTextRender::getCairoContext called, so that the forced read +//from the underlying X Drawable gets it to sync. +rDevice.DrawText(aLogicRect.BottomLeft(), " "); +rDevice.DrawRect(aLogicRect); // paint the editeng text tools::Rectangle aEditRect(Point(nScrX, nScrY), Size(aOutputData.GetScrW(), aOutputData.GetScrH())); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editeng.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f0b3e2241e05472ad84bb9a2a7f9b7142ec54863
Author: Stephan Bergmann
Date: Fri Apr 13 10:32:45 2018 +0200
-Werror,-Wreturn-std-move
("local variable 'aFont' will be copied despite being returned by name";
emitted
by Clang trunk)
Change-Id: I4c876ec5b92b55ae5d1cc72a0e993d96d88c8071
Reviewed-on: https://gerrit.libreoffice.org/52812
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 0b0305ab06cc..d09e37dd4952 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -18,6 +18,8 @@
*/
#include
+#include
+
#include
#include
#include
@@ -2648,7 +2650,7 @@ vcl::Font EditEngine::CreateFontFromItemSet( const
SfxItemSet& rItemSet, SvtScri
{
SvxFont aFont;
CreateFont( aFont, rItemSet, true, nScriptType );
-return aFont;
+return std::move(aFont);
}
SvxFont EditEngine::CreateSvxFontFromItemSet( const SfxItemSet& rItemSet )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/unx
vcl/unx/kde5/KDE5SalInstance.cxx |6 --
vcl/unx/kde5/KDE5SalInstance.hxx |1 -
2 files changed, 7 deletions(-)
New commits:
commit 8c1d2df66aadcecb9add585307a4cad2fa3d19e1
Author: Katarina Behrens
Date: Fri Apr 13 11:32:44 2018 +0200
Remove unused headers and commented-out code
Change-Id: I8dee846d9499f1549f5e61deaad885b93d2f5438
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index b5ce3f812c72..dcf167312a75 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -23,7 +23,6 @@
#include
#include
#include
-#include
#include
#include
@@ -59,11 +58,6 @@ uno::Reference< ui::dialogs::XFilePicker2 >
KDE5SalInstance::createFilePicker(
return SalInstance::createFilePicker( xMSF );
}
-/*SalX11Display* KDE5SalInstance::CreateDisplay() const
-{
-return new SalKDE5Display( QX11Info::display() );
-}*/
-
bool KDE5SalInstance::IsMainThread() const
{
return qApp->thread() == QThread::currentThread();
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 7b549a18c08d..45a20e6cfaa2 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include
#include
#include "KDE5SalFrame.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/ClientSession.cpp
wsd/ClientSession.cpp | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 6136cc34d679c409da2506ed5fe96394f2c7ca41
Author: Tamás Zolnai
Date: Thu Apr 12 20:28:54 2018 +0200
Update dumper code to handle new payload for invalidatecursor
Change-Id: Ibfe129ce4db9ff33d409fb6ebabfb3a435b64829
Reviewed-on: https://gerrit.libreoffice.org/52804
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index b307e2e6b..77a6e075a 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -781,16 +781,23 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
else if (tokens[0] == "invalidatecursor:")
{
assert(firstLine.size() ==
static_cast(length));
-StringTokenizer firstLineTokens(firstLine, " ",
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+
+const size_t index = firstLine.find_first_of('{');
+const std::string stringJSON = firstLine.substr(index);
+Poco::JSON::Parser parser;
+const Poco::Dynamic::Var result = parser.parse(stringJSON);
+const auto& object = result.extract();
+const std::string rectangle = object->get("rectangle").toString();
+StringTokenizer rectangleTokens(rectangle, ",",
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
int x = 0, y = 0, w = 0, h = 0;
-if (firstLineTokens.count() > 2 &&
-stringToInteger(firstLineTokens[1], x) &&
-stringToInteger(firstLineTokens[2], y))
+if (rectangleTokens.count() > 2 &&
+stringToInteger(rectangleTokens[0], x) &&
+stringToInteger(rectangleTokens[1], y))
{
-if (firstLineTokens.count() > 3)
+if (rectangleTokens.count() > 3)
{
-stringToInteger(firstLineTokens[3], w);
-stringToInteger(firstLineTokens[4], h);
+stringToInteger(rectangleTokens[2], w);
+stringToInteger(rectangleTokens[3], h);
}
docBroker->invalidateCursor(x, y, w, h);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/ClientSession.cpp
wsd/ClientSession.cpp | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 347c0705c20b98a787bb59902f57b6df0e104bb0
Author: Tamás Zolnai
Date: Thu Apr 12 20:28:54 2018 +0200
Update dumper code to handle new payload for invalidatecursor
Change-Id: Ibfe129ce4db9ff33d409fb6ebabfb3a435b64829
Reviewed-on: https://gerrit.libreoffice.org/52796
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 12f30a8e5..00833bd05 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -781,16 +781,23 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
else if (tokens[0] == "invalidatecursor:")
{
assert(firstLine.size() ==
static_cast(length));
-StringTokenizer firstLineTokens(firstLine, " ",
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+
+const size_t index = firstLine.find_first_of('{');
+const std::string stringJSON = firstLine.substr(index);
+Poco::JSON::Parser parser;
+const Poco::Dynamic::Var result = parser.parse(stringJSON);
+const auto& object = result.extract();
+const std::string rectangle = object->get("rectangle").toString();
+StringTokenizer rectangleTokens(rectangle, ",",
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
int x = 0, y = 0, w = 0, h = 0;
-if (firstLineTokens.count() > 2 &&
-stringToInteger(firstLineTokens[1], x) &&
-stringToInteger(firstLineTokens[2], y))
+if (rectangleTokens.count() > 2 &&
+stringToInteger(rectangleTokens[0], x) &&
+stringToInteger(rectangleTokens[1], y))
{
-if (firstLineTokens.count() > 3)
+if (rectangleTokens.count() > 3)
{
-stringToInteger(firstLineTokens[3], w);
-stringToInteger(firstLineTokens[4], h);
+stringToInteger(rectangleTokens[2], w);
+stringToInteger(rectangleTokens[3], h);
}
docBroker->invalidateCursor(x, y, w, h);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/qa sw/source
sw/qa/extras/layout/data/tdf116925.docx |binary
sw/qa/extras/layout/layout.cxx | 22 ++
sw/source/core/layout/paintfrm.cxx | 26 +-
3 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit 7ed2e2e74d86cc2c9c3e1fe18f5ab160c89d3a44
Author: Miklos Vajna
Date: Tue Apr 10 17:46:55 2018 +0200
tdf#116925 sw: consider fill styles of shape for in-textbox auto color
Automatic color is determined in SwDrawTextInfo::ApplyAutoColor(), but
it uses this function to determine the background color.
Be consistent and consider the same background in both the
shape-with-editeng-text and shape-with-sw-text cases.
(cherry picked from commit f966767e1ccfa432da33e1a0fd6de69e17a36bc3)
Change-Id: I52249a908193765bc128789d96187af334c1017c
Reviewed-on: https://gerrit.libreoffice.org/52707
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/layout/data/tdf116925.docx
b/sw/qa/extras/layout/data/tdf116925.docx
new file mode 100644
index ..1c99752e9eba
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf116925.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 16efa14c5875..3709e306f53d 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -17,9 +17,11 @@ class SwLayoutWriter : public SwModelTestBase
{
public:
void testTdf116830();
+void testTdf116925();
CPPUNIT_TEST_SUITE(SwLayoutWriter);
CPPUNIT_TEST(testTdf116830);
+CPPUNIT_TEST(testTdf116925);
CPPUNIT_TEST_SUITE_END();
private:
@@ -62,6 +64,26 @@ void SwLayoutWriter::testTdf116830()
assertXPath(pXmlDoc,
"/metafile/push[1]/push[1]/push[1]/push[3]/push[1]/rect", 1);
}
+void SwLayoutWriter::testTdf116925()
+{
+SwDoc* pDoc = createDoc("tdf116925.docx");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumper.dumpAndParse(*xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPathContent(pXmlDoc,
+
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/push[3]/textarray/text",
+ "hello");
+// This failed, text color was #00.
+assertXPath(
+pXmlDoc,
+
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/push[3]/textcolor[@color='#ff']",
1);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutWriter);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 80d12a53f873..4c54017b14b7 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -100,6 +100,7 @@
#include
#include
#include
+#include
#include
#include
@@ -7347,7 +7348,30 @@ bool SwFrame::GetBackgroundBrush(
return false;
if (pFrame->supportsFullDrawingLayerFillAttributeSet())
-rFillAttributes = pFrame->getSdrAllFillAttributesHelper();
+{
+bool bTextBox = false;
+if (pFrame->IsFlyFrame())
+{
+const SwFlyFrame* pFlyFrame = static_cast(pFrame);
+SwFrameFormat* pShape
+=
SwTextBoxHelper::getOtherTextBoxFormat(pFlyFrame->GetFormat(), RES_FLYFRMFMT);
+if (pShape)
+{
+SdrObject* pObject = pShape->FindRealSdrObject();
+if (pObject)
+{
+// Work with the fill attributes of the shape of the
fly frame.
+rFillAttributes.reset(
+new
drawinglayer::attribute::SdrAllFillAttributesHelper(
+pObject->GetMergedItemSet()));
+bTextBox = true;
+}
+}
+}
+
+if (!bTextBox)
+rFillAttributes = pFrame->getSdrAllFillAttributesHelper();
+}
const SvxBrushItem &rBack = pFrame->GetAttrSet()->GetBackground();
if( pFrame->IsSctFrame() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source vcl/source
sfx2/source/sidebar/Tools.cxx | 15 +++
vcl/source/image/Image.cxx| 24 ++--
2 files changed, 21 insertions(+), 18 deletions(-)
New commits:
commit f8072cc8e43b42e2bfa227bb33aa06be69233e46
Author: Tomaž Vajngerl
Date: Thu Apr 12 14:46:49 2018 +0900
Don't abuse loading of a Graphic to actually load an Image
Change-Id: I816c46542088f36ef69b127cc13080e3bc8cdfc2
Reviewed-on: https://gerrit.libreoffice.org/52806
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index 727cd6f24bec..47c27adb2520 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -27,7 +27,6 @@
#include
#include
-#include
#include
#include
@@ -60,18 +59,10 @@ Image Tools::GetImage (
const Image
aPanelImage(vcl::CommandInfoProvider::GetImageForCommand(rsURL, rxFrame));
return aPanelImage;
}
-else
+else if (rsURL.startsWith("private:graphicrepository"))
{
-const Reference xContext
(::comphelper::getProcessComponentContext());
-const Reference xGraphicProvider =
-graphic::GraphicProvider::create( xContext );
-::comphelper::NamedValueCollection aMediaProperties;
-aMediaProperties.put("URL", rsURL);
-const Reference xGraphic (
-
xGraphicProvider->queryGraphic(aMediaProperties.getPropertyValues()),
-UNO_QUERY);
-if (xGraphic.is())
-return Image(xGraphic);
+const Image aPanelImage(rsURL);
+return aPanelImage;
}
}
return Image();
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index e99cccd0f256..e9e105c10bf0 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -54,13 +54,25 @@ Image::Image(const css::uno::Reference<
css::graphic::XGraphic >& rxGraphic)
Image::Image(const OUString & rFileUrl)
{
-OUString aPath;
-osl::FileBase::getSystemPathFromFileURL(rFileUrl, aPath);
-Graphic aGraphic;
-const OUString aFilterName(IMP_PNG);
-if (ERRCODE_NONE == GraphicFilter::LoadGraphic(aPath, aFilterName,
aGraphic))
+sal_Int32 nIndex = 0;
+if (rFileUrl.getToken( 0, '/', nIndex ) == "private:graphicrepository")
{
-ImplInit(aGraphic.GetBitmapEx());
+OUString sPathName(rFileUrl.copy(nIndex));
+BitmapEx aBitmapEx;
+if (vcl::ImageRepository::loadImage(sPathName, aBitmapEx))
+{
+ImplInit(aBitmapEx);
+}
+}
+else
+{
+OUString aPath;
+osl::FileBase::getSystemPathFromFileURL(rFileUrl, aPath);
+Graphic aGraphic;
+if (ERRCODE_NONE == GraphicFilter::LoadGraphic(aPath, IMP_PNG,
aGraphic))
+{
+ImplInit(aGraphic.GetBitmapEx());
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source sw/inc sw/source sw/uiconfig uui/source vcl/unx
include/svx/langbox.hxx |1
include/svx/txencbox.hxx| 70 +
svx/source/dialog/txencbox.cxx | 150
sw/inc/swabstdlg.hxx|4
sw/source/ui/dialog/ascfldlg.cxx| 150 +---
sw/source/ui/dialog/swdlgfact.cxx | 14 +-
sw/source/ui/dialog/swdlgfact.hxx | 14 +-
sw/source/uibase/inc/SwXFilterOptions.hxx |7 +
sw/source/uibase/inc/ascfldlg.hxx | 32 ++---
sw/source/uibase/uno/SwXFilterOptions.cxx | 10 +
sw/uiconfig/swriter/ui/asciifilterdialog.ui | 71 ++---
uui/source/iahndl-filter.cxx| 15 ++
vcl/unx/gtk3/gtk3gtkinst.cxx|2
13 files changed, 392 insertions(+), 148 deletions(-)
New commits:
commit 2b2fe50f33f7d677098f3ebafa8357aea848c0ea
Author: Caolán McNamara
Date: Thu Apr 12 13:42:04 2018 +0100
weld SwAsciiFilterDlg and set an explicit parent for the dialog
Change-Id: Ie2a52a9e2ea7f41a336b227de670cd5f688d7cd4
Reviewed-on: https://gerrit.libreoffice.org/52778
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 45c852fd3cbd..b64f5d28fc3f 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -170,6 +170,7 @@ public:
voidSelectEntryPos(int nPos) { m_xControl->set_active(nPos); }
void connect_changed(const Link& rLink) {
m_aChangeHdl = rLink; }
+void hide() { m_xControl->hide(); }
};
class SVX_DLLPUBLIC SvxLanguageComboBox : public ComboBox, public
SvxLanguageBoxBase
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index b9827c3cc841..41e761f6c6a4 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SVX_TXENCBOX_HXX
#include
+#include
#include
#include
@@ -88,6 +89,75 @@ public:
rtl_TextEncodingGetSelectTextEncoding() const;
};
+class SVX_DLLPUBLIC TextEncodingBox
+{
+private:
+std::unique_ptr m_xControl;
+
+public:
+TextEncodingBox(weld::ComboBoxText* pControl);
+
+~TextEncodingBox();
+
+/** Fill with all known encodings but exclude those matching one or more
+given flags as defined in rtl/tencinfo.h
+
+ If nButIncludeInfoFlags is given, encodings are included even if
they
+ match nExcludeInfoFlags. Thus it is possible to exclude 16/32-bit
+ Unicode with RTL_TEXTENCODING_INFO_UNICODE but to include UTF7 and
UTF8
+ with RTL_TEXTENCODING_INFO_MIME
+
+@param bExcludeImportSubsets
+If , some specific encodings are not listed, as they are a
+subset of another encoding. This is the case for
+RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_GBK,
+RTL_TEXTENCODING_MS_936, which are covered by
+RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
+ whenever the box is used in import dialogs. */
+voidFillFromTextEncodingTable(
+bool bExcludeImportSubsets,
+sal_uInt32 nExcludeInfoFlags = 0,
+sal_uInt32 nButIncludeInfoFlags = 0
+);
+
+/** Fill with all encodings known to the dbtools::OCharsetMap but exclude
+those matching one or more given flags as defined in rtl/tencinfo.h
+
+ If nButIncludeInfoFlags is given, encodings are included even if
they
+ match nExcludeInfoFlags. Thus it is possible to exclude 16/32-bit
+ Unicode with RTL_TEXTENCODING_INFO_UNICODE but to include UTF7 and
UTF8
+ with RTL_TEXTENCODING_INFO_MIME
+
+@param bExcludeImportSubsets
+If , some specific encodings are not listed, as they are a
+subset of another encoding. This is the case for
+RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_GBK,
+RTL_TEXTENCODING_MS_936, which are covered by
+RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
+ whenever the box is used in import dialogs. */
+voidFillFromDbTextEncodingMap(
+bool bExcludeImportSubsets,
+sal_uInt32 nExcludeInfoFlags = 0
+);
+
+/** Fill with all known MIME encodings and select the best according to
+GetBestMimeEncoding
+ */
+voidFillWithMimeAndSelectBest();
+
+voidInsertTextEncoding( const rtl_TextEncoding nEnc );
+
+voidInsertTextEncoding( const rtl_TextEncoding nEnc,
+const OUString& rEntry );
+
+voidSelectTextEncoding( const rtl_TextEncoding nEnc );
+
+rtl_TextEncodingGetSelectTextEncoding() const;
+
+void connect_changed(const Lin
[Libreoffice-commits] core.git: include/svtools include/vcl svtools/source vcl/qa vcl/source
include/svtools/roadmapwizard.hxx |4
include/svtools/wizardmachine.hxx |1 -
include/svtools/wizdlg.hxx|1 -
include/vcl/dialog.hxx|1 -
svtools/source/dialogs/roadmapwizard.cxx |7 ---
svtools/source/dialogs/wizardmachine.cxx | 12
svtools/source/dialogs/wizdlg.cxx |7 ---
svtools/source/uno/wizard/wizardshell.cxx |2 +-
vcl/qa/cppunit/lifecycle.cxx |4 +---
vcl/source/window/dialog.cxx |6 --
10 files changed, 2 insertions(+), 43 deletions(-)
New commits:
commit 34d362b5c249f78ed05c5b069fa90e9597d29c04
Author: Caolán McNamara
Date: Wed Apr 11 21:21:53 2018 +0100
drop ModalDialog non .ui ctor
Change-Id: Ib26f0b4d76c530e0aa67f74f6a6920b1883eb8e4
Reviewed-on: https://gerrit.libreoffice.org/52766
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svtools/roadmapwizard.hxx
b/include/svtools/roadmapwizard.hxx
index f08add2269e2..30f58d6f13d3 100644
--- a/include/svtools/roadmapwizard.hxx
+++ b/include/svtools/roadmapwizard.hxx
@@ -67,10 +67,6 @@ namespace svt
public:
RoadmapWizard(
-vcl::Window* _pParent,
-const WinBits i_nStyle
-);
-RoadmapWizard(
vcl::Window* _pParent
);
virtual ~RoadmapWizard( ) override;
diff --git a/include/svtools/wizardmachine.hxx
b/include/svtools/wizardmachine.hxx
index 2bb25bba8a13..68ad14a134bf 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -169,7 +169,6 @@ namespace svt
std::unique_ptr m_pImpl;
public:
-OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle,
WizardButtonFlags _nButtonFlags );
OWizardMachine(vcl::Window* _pParent, WizardButtonFlags _nButtonFlags
);
virtual ~OWizardMachine() override;
virtual void dispose() override;
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 1dc2e48b69c7..7d8b54e33119 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -218,7 +218,6 @@ private:
SVT_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const;
public:
-WizardDialog( vcl::Window* pParent, WinBits nStyle );
WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString&
rUIXMLDescription );
virtual ~WizardDialog() override;
virtual void dispose() override;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 45f76c1e5521..36f88b8feb45 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -195,7 +195,6 @@ public:
class VCL_DLLPUBLIC ModalDialog : public Dialog
{
public:
-explicitModalDialog( vcl::Window* pParent, WinBits nStyle =
WB_STDMODAL );
explicitModalDialog( vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription, bool bBorder = false );
protected:
diff --git a/svtools/source/dialogs/roadmapwizard.cxx
b/svtools/source/dialogs/roadmapwizard.cxx
index 281009f5f5e9..33d0a6d185d2 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -115,13 +115,6 @@ namespace svt
}
//= RoadmapWizard
-RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, const WinBits
i_nStyle )
-:OWizardMachine( _pParent, i_nStyle, WizardButtonFlags::NEXT |
WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH |
WizardButtonFlags::CANCEL | WizardButtonFlags::HELP )
-,m_pImpl( new RoadmapWizardImpl )
-{
-impl_construct();
-}
-
RoadmapWizard::RoadmapWizard( vcl::Window* _pParent )
:OWizardMachine( _pParent, WizardButtonFlags::NEXT |
WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH |
WizardButtonFlags::CANCEL | WizardButtonFlags::HELP )
,m_pImpl( new RoadmapWizardImpl )
diff --git a/svtools/source/dialogs/wizardmachine.cxx
b/svtools/source/dialogs/wizardmachine.cxx
index ae5bdac443d3..b1bbb41155a5 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -90,18 +90,6 @@ namespace svt
}
};
-OWizardMachine::OWizardMachine(vcl::Window* _pParent, const WinBits
i_nStyle, WizardButtonFlags _nButtonFlags )
-:WizardDialog( _pParent, i_nStyle )
-,m_pFinish(nullptr)
-,m_pCancel(nullptr)
-,m_pNextPage(nullptr)
-,m_pPrevPage(nullptr)
-,m_pHelp(nullptr)
-,m_pImpl( new WizardMachineImplData )
-{
-implConstruct( _nButtonFlags );
-}
-
OWizardMachine::OWizardMachine(vcl::Window* _pParent, WizardButtonFlags
_nButtonFlags )
:WizardDialog( _pParent, "WizardDialog", "svt/ui/wizarddialog.ui" )
,m_pFinish(nullptr)
diff --git a/svtools/source/dialogs/wizdlg.cxx
b/svtools/source/dialogs/wizdlg.cxx
index c0b3c3788c4a..20ac15d14c20 100644
--- a/svto
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 63f6a1970868b3f8e5bc612f405d24ac9445ccea Author: Xisco Fauli Date: Wed Apr 11 16:42:05 2018 +0200 tdf#116874: Don't sign with watermark if the checkbox is disabled Change-Id: I354b0c3f0d6d29d91c1d7fa9678c4ce0bd7c8c1a Reviewed-on: https://gerrit.libreoffice.org/52732 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 8f10bc871420..90a79968ada6 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -727,7 +727,8 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) paParent->mbExportFormFields = mpCbExportFormFields->IsChecked(); } -paParent->maWatermarkText = mpEdWatermark->GetText(); +if( mpCbWatermark->IsChecked() ) +paParent->maWatermarkText = mpEdWatermark->GetText(); /* * FIXME: the entries are only implicitly defined by the resource file. Should there ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svx sc/inc sc/source sd/inc sd/source svx/source sw/source
include/svx/galmisc.hxx |4 ++--
include/svx/svdobj.hxx |4 ++--
include/svx/svdotext.hxx |2 +-
sc/inc/userdat.hxx |6 +++---
sc/source/core/data/drwlayer.cxx |6 +++---
sc/source/core/data/userdat.cxx | 12 ++--
sc/source/ui/docshell/impex.cxx | 12 ++--
sc/source/ui/inc/impex.hxx |4 ++--
sc/source/ui/unoobj/shapeuno.cxx |2 +-
sc/source/ui/view/tabvwsh9.cxx |2 +-
sd/inc/anminfo.hxx |2 +-
sd/inc/imapinfo.hxx |2 +-
sd/source/core/anminfo.cxx |4 ++--
sd/source/core/drawdoc2.cxx |2 +-
sd/source/ui/unoidl/unoobj.cxx |2 +-
sd/source/ui/view/drviewsg.cxx |2 +-
sd/source/ui/view/sdview3.cxx|4 ++--
sd/source/ui/view/sdview4.cxx|6 +++---
svx/source/dialog/imapwnd.cxx|8
svx/source/dialog/imapwnd.hxx|2 +-
svx/source/gallery2/galtheme.cxx |2 +-
svx/source/inc/svdobjuserdatalist.hxx|2 +-
svx/source/svdraw/svdobj.cxx |4 ++--
svx/source/svdraw/svdobjplusdata.cxx |6 +++---
svx/source/svdraw/svdobjuserdatalist.cxx |4 ++--
svx/source/svdraw/svdotxln.cxx |6 +++---
sw/source/filter/ww8/ww8par.cxx |6 +++---
sw/source/filter/ww8/ww8par.hxx |2 +-
28 files changed, 60 insertions(+), 60 deletions(-)
New commits:
commit 0fdcfedd898afcc03332a432ef21052eee6b3a3a
Author: Noel Grandin
Date: Thu Apr 12 15:07:39 2018 +0200
make SdrObjUserData::Clone return std::unique_ptr
Change-Id: Iffe047b081fde0bb582d8730a8e96d2597c7567a
Reviewed-on: https://gerrit.libreoffice.org/52780
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index dd2aea3c5a16..5605c8a093f0 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -105,11 +105,11 @@ public:
SdrObjUserData( SdrInventor::SgaImap,
ID_IMAPINFO ),
aImageMap( rImageMap ) {};
-virtual SdrObjUserData* Clone( SdrObject* ) const override
+virtual std::unique_ptr Clone( SdrObject* ) const override
{
SgaIMapInfo* pInfo = new SgaIMapInfo;
pInfo->aImageMap = aImageMap;
-return pInfo;
+return std::unique_ptr(pInfo);
}
const ImageMap& GetImageMap() const { return aImageMap; }
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 7d033605933a..6cf9336ea014 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -213,7 +213,7 @@ public:
SdrObjUserData(const SdrObjUserData& rData);
virtual ~SdrObjUserData();
-virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039#
NULL -> 0
+virtual std::unique_ptr Clone(SdrObject* pObj1) const = 0;
// #i71039# NULL -> 0
SdrInventor GetInventor() const { return nInventor;}
sal_uInt16 GetId() const { return nIdentifier;}
};
@@ -803,7 +803,7 @@ public:
sal_uInt16 GetUserDataCount() const;
SdrObjUserData* GetUserData(sal_uInt16 nNum) const;
-void AppendUserData(SdrObjUserData* pData);
+void AppendUserData(std::unique_ptr pData);
// removes the record from the list and performs delete (FreeMem+Dtor).
void DeleteUserData(sal_uInt16 nNum);
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 13ff8940d0c1..b285d8bece72 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -116,7 +116,7 @@ public:
ImpSdrObjTextLinkUserData();
virtual ~ImpSdrObjTextLinkUserData() override;
-virtual SdrObjUserData* Clone(SdrObject* pObj1) const override;
+virtual std::unique_ptr Clone(SdrObject* pObj1) const
override;
};
namespace sdr
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index 04c6893faded..655d869b0d84 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -60,7 +60,7 @@ public:
};
private:
- virtual ScDrawObjData* Clone( SdrObject* pObj ) const override;
+ virtual std::unique_ptr Clone( SdrObject* pObj ) const
override;
// Stores the last cell rect this shape was anchored to.
// Needed when the cell is resized to resize the image accordingly.
@@ -78,7 +78,7 @@ public:
ScIMapInfo( const ScIMapInfo& rIMapInfo );
virtual ~ScIMapInfo() override;
-virtual SdrObjUserData* Clone( SdrObject* pObj ) const override;
+virtual std::unique_ptr Clone( SdrObject* pObj ) const
override;
voidSetImageMap( const ImageMap& rIMap ){ aImageMap = rIMap; }
const ImageMap& GetImageMap() const
[Libreoffice-commits] core.git: cui/source include/vcl vcl/source
cui/source/dialogs/SpellAttrib.cxx | 12 ++--
cui/source/dialogs/SpellAttrib.hxx |6 +++---
include/vcl/txtattr.hxx|8
vcl/source/edit/txtattr.cxx| 12 ++--
4 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 846027306a9edcbdf7bf1a3271fd6f8b0d4b139d
Author: Noel Grandin
Date: Wed Apr 11 14:06:15 2018 +0200
make TextAttrib::Clone return by std::unique_ptr
Change-Id: I8e3941c4c8507e7a898f5f2e0fb13543e5c129cd
Reviewed-on: https://gerrit.libreoffice.org/52748
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/dialogs/SpellAttrib.cxx
b/cui/source/dialogs/SpellAttrib.cxx
index 7207f6c791e0..9d761a55b3f1 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -38,9 +38,9 @@ void SpellErrorAttrib::SetFont( vcl::Font& ) const
}
-TextAttrib* SpellErrorAttrib::Clone() const
+std::unique_ptr SpellErrorAttrib::Clone() const
{
-return new SpellErrorAttrib(*this);
+return std::unique_ptr(new SpellErrorAttrib(*this));
}
@@ -64,9 +64,9 @@ void SpellLanguageAttrib::SetFont( vcl::Font& ) const
}
-TextAttrib* SpellLanguageAttrib::Clone() const
+std::unique_ptr SpellLanguageAttrib::Clone() const
{
-return new SpellLanguageAttrib(*this);
+return std::unique_ptr(new SpellLanguageAttrib(*this));
}
@@ -90,9 +90,9 @@ void SpellBackgroundAttrib::SetFont( vcl::Font& rFont ) const
}
-TextAttrib* SpellBackgroundAttrib::Clone() const
+std::unique_ptr SpellBackgroundAttrib::Clone() const
{
-return new SpellBackgroundAttrib(*this);
+return std::unique_ptr(new SpellBackgroundAttrib(*this));
}
diff --git a/cui/source/dialogs/SpellAttrib.hxx
b/cui/source/dialogs/SpellAttrib.hxx
index aabf466235c3..2a458166b42d 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -103,7 +103,7 @@ public:
virtual voidSetFont( vcl::Font& rFont ) const override;
-virtual TextAttrib* Clone() const override;
+virtual std::unique_ptr Clone() const override;
virtual booloperator==( const TextAttrib& rAttr ) const
override;
};
@@ -118,7 +118,7 @@ public:
LanguageTypeGetLanguage() const {return m_eLanguage;}
virtual voidSetFont( vcl::Font& rFont ) const override;
-virtual TextAttrib* Clone() const override;
+virtual std::unique_ptr Clone() const override;
virtual booloperator==( const TextAttrib& rAttr ) const
override;
};
@@ -131,7 +131,7 @@ public:
SpellBackgroundAttrib(const Color& rCol);
virtual voidSetFont( vcl::Font& rFont ) const override;
-virtual TextAttrib* Clone() const override;
+virtual std::unique_ptr Clone() const override;
virtual booloperator==( const TextAttrib& rAttr ) const
override;
};
}//namespace svx
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index 8fadf98cc46f..db8da72f3d47 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -51,7 +51,7 @@ public:
sal_uInt16 Which() const { return mnWhich; }
virtual voidSetFont( vcl::Font& rFont ) const = 0;
-virtual TextAttrib* Clone() const = 0;
+virtual std::unique_ptr Clone() const = 0;
virtual booloperator==( const TextAttrib& rAttr ) const = 0;
booloperator!=( const TextAttrib& rAttr ) const
@@ -70,7 +70,7 @@ public:
const Color&GetColor() const { return maColor; }
virtual voidSetFont( vcl::Font& rFont ) const override;
-virtual TextAttrib* Clone() const override;
+virtual std::unique_ptr Clone() const override;
virtual booloperator==( const TextAttrib& rAttr ) const
override;
};
@@ -84,7 +84,7 @@ public:
TextAttribFontWeight( FontWeight eWeight );
virtual voidSetFont( vcl::Font& rFont ) const override;
-virtual TextAttrib* Clone() const override;
+virtual std::unique_ptr Clone() const override;
virtual booloperator==( const TextAttrib& rAttr ) const
override;
FontWeight getFontWeight() const { return meWeight; }
@@ -96,7 +96,7 @@ public:
TextAttribProtect();
virtual voidSetFont( vcl::Font& rFont ) const override;
-virtual TextAttrib* Clone() const override;
+virtual std::unique_ptr Clone() const override;
virtual booloperator==( const TextAttrib& rAttr ) const
override;
};
diff --git a/vcl/source/edit/txtattr.cxx b/vcl/source/edit/txtattr.cxx
index 006c77b99160..8e979c1e3f94 100644
--- a/vcl/source/edit/txtattr.cxx
+++ b/vcl/source/edit/txtattr.cxx
@@ -39,9 +39,9 @@ void TextAttribFontColor::SetFont( vcl::Font& rFont ) const
rFont.SetColor( maColor );
}
-TextAttrib* TextAtt
[Libreoffice-commits] core.git: external/firebird
external/firebird/asan.patch |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 9ddc4b62b4bdf04a2aeeddb053b00ccc031e83ef Author: Stephan Bergmann Date: Fri Apr 13 09:11:00 2018 +0200 external/firebird: Even more LIBO_TUNNEL_LIBRARY_PATH ...as needed by some builders, apparently. Change-Id: I94f3059121d21d55fc7f87d5554bf192f6858e06 diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch index 1edcf86bce29..4c40f52bfc87 100644 --- a/external/firebird/asan.patch +++ b/external/firebird/asan.patch @@ -57,15 +57,17 @@ $(BUILD_FILE):$(BUILD_Objects) $(COMMON_LIB) --- builds/posix/Makefile.in.examples +++ builds/posix/Makefile.in.examples -@@ -123,7 +123,7 @@ +@@ -123,8 +123,8 @@ $(EMPLOYEE_DB): $(EXAMPLES_DEST)/empbuild$(EXEC_EXT) $(INPUT_Sources) $(EXAMPLES_DEST)/isql$(EXEC_EXT) -$(RM) $(EMPLOYEE_DB) - ./empbuild $(EMPLOYEE_DB) +- $(GFIX) -write sync $(EMPLOYEE_DB) + $(LIBO_TUNNEL_LIBRARY_PATH) ./empbuild $(EMPLOYEE_DB) - $(GFIX) -write sync $(EMPLOYEE_DB) ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(GFIX) -write sync $(EMPLOYEE_DB) -$(CHMOD_6) $(EMPLOYEE_DB) + # To get past the fact isql is called from the programs, we create a local link in this directory @@ -140,7 +140,7 @@ $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql $(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/tools/emfphelperdata.cxx | 33 +
drawinglayer/source/tools/emfpstringformat.cxx | 16 ++--
drawinglayer/source/tools/emfpstringformat.hxx |8 +++---
3 files changed, 46 insertions(+), 11 deletions(-)
New commits:
commit ba662ea44083107f10184a4f01b94f9b8e3ed3dc
Author: Bartosz Kosiorek
Date: Tue Apr 10 22:15:01 2018 +0200
tdf#106084 EMF+ Implement String aligment and Leading/Trailing Margin.
Many users noticing that EMF DrawString is shifted horizontally in same
cases.
It is caused by missing implementation of:
- StringAlignment:
Near: Alignment is to the left side of the layout rectangle
Center: Specifies that alignment is centered
between the origin and extent of the layout rectangle.
Far: Alignment is to the right side of the layout rectangle
- Leading Margin: specifies the length of the space to add
to the starting position of a string
- trailing Margin: Length of the space to leave following a string.
With this path this missing parameters are implemented.
It was tested with document:
https://bugs.documentfoundation.org/attachment.cgi?id=131334
In following document StringAlignmentCenter and LeadingMargin is not set:
https://bugs.documentfoundation.org/attachment.cgi?id=124180
I make sure that there is no regression (the image should be displayed
as without the patch.
Change-Id: I7909a1d02ffd558a3bf91bd41f6945830252724d
Reviewed-on: https://gerrit.libreoffice.org/52696
Tested-by: Jenkins
Reviewed-by: Patrick Jaap
Reviewed-by: Bartosz Kosiorek
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 3118e6cd8e56..49ed0f13b734 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -100,6 +100,13 @@ namespace emfplushelper
{
}
+typedef enum
+{
+StringAlignmentNear = 0x,
+StringAlignmentCenter = 0x0001,
+StringAlignmentFar = 0x0002
+} StringAlignment;
+
void EmfPlusHelperData::processObjectRecord(SvMemoryStream& rObjectStream,
sal_uInt16 flags, sal_uInt32 dataSize, bool bUseWholeStream)
{
sal_uInt32 index;
@@ -1244,12 +1251,12 @@ namespace emfplushelper
SAL_INFO("drawinglayer", "EMF+ DrawString
layoutRect: " << lx << "," << ly << " - " << lw << "x" << lh);
// parse the string
-OUString text = read_uInt16s_ToOUString(rMS,
stringLength);
+const OUString text = read_uInt16s_ToOUString(rMS,
stringLength);
SAL_INFO("drawinglayer", "EMF+ DrawString string:
" << text);
// get the stringFormat from the Object table (
this is OPTIONAL and may be nullptr )
-EMFPStringFormat *stringFormat = static_cast<
EMFPStringFormat* >(maEMFPObjects[formatId & 0xff].get());
+const EMFPStringFormat *stringFormat =
static_cast< EMFPStringFormat* >(maEMFPObjects[formatId & 0xff].get());
// get the font from the flags
-EMFPFont *font = static_cast< EMFPFont* >(
maEMFPObjects[flags & 0xff].get() );
+const EMFPFont *font = static_cast< EMFPFont* >(
maEMFPObjects[flags & 0xff].get() );
if (!font)
{
break;
@@ -1275,8 +1282,24 @@ namespace emfplushelper
false);
// BiDiStrong
css::lang::Locale locale;
+double stringAlignmentHorizontalOffset = 0.0;
if (stringFormat)
{
+SAL_WARN_IF(stringFormat &&
stringFormat->DirectionRightToLeft(), "drawinglayer", "EMF+ DrawString
Alignment TODO For a right-to-left layout rectangle, the origin should be at
the upper right.");
+if (stringFormat->stringAlignment ==
StringAlignmentNear)
+// Alignment is to the left side of the layout
rectangle (lx, ly, lw, lh)
+{
+stringAlignmentHorizontalOffset =
stringFormat->leadingMargin * font->emSize;
+} else if (stringFormat->stringAlignment ==
StringAlignmentCenter)
+// Alignment is centered between the origin
and extent of the layout rectangle
+{
+stringAlignmentHorizontalOffset = 0.5 * lw
+ stringFormat->leadingMargin * font->emSize - 0.3 * font->emSize
[Libreoffice-commits] core.git: setup_native/Library_instooofiltmsi.mk setup_native/source
setup_native/Library_instooofiltmsi.mk
|1
setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
| 58 +-
2 files changed, 12 insertions(+), 47 deletions(-)
New commits:
commit 3bd63cc5d6e24139d41f029993dc54d7b2e07e87
Author: Mike Kaganski
Date: Fri Apr 13 06:52:14 2018 +0100
I guess it's time to remove some Win9x code
Change-Id: I921207fb73b2dc1e0f55836fa87c3338ff4fe1a9
Reviewed-on: https://gerrit.libreoffice.org/52807
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/setup_native/Library_instooofiltmsi.mk
b/setup_native/Library_instooofiltmsi.mk
index 4d0ae63679f3..36e2e2a6b81c 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -32,6 +32,7 @@ $(eval $(call
gb_Library_use_system_win32_libs,instooofiltmsi,\
libucrt \
libvcruntime \
kernel32 \
+ advapi32 \
))
# vim: set noet sw=4 ts=4:
diff --git
a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
index 4fad91039c7e..783198fdf08a 100644
---
a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
+++
b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
@@ -30,34 +30,16 @@
#include
#include
-/*
-Advapi.dll needs to be loaded dynamically because the service
-control functions are not available under Windows 9x.
-*/
-typedef BOOL (__stdcall * CloseServiceHandle_t)(SC_HANDLE);
-typedef BOOL (__stdcall * ControlService_t)(SC_HANDLE, DWORD,
LPSERVICE_STATUS);
-typedef SC_HANDLE (__stdcall * OpenSCManager_t)(LPCWSTR, LPCWSTR, DWORD);
-typedef SC_HANDLE (__stdcall * OpenService_t)(SC_HANDLE, LPCWSTR, DWORD);
-typedef BOOL (__stdcall * QueryServiceStatus_t)(SC_HANDLE, LPSERVICE_STATUS);
-typedef BOOL (__stdcall * StartService_t)(SC_HANDLE, DWORD, LPCWSTR*);
-
-static CloseServiceHandle_t CloseServiceHandle_ = nullptr;
-static ControlService_t ControlService_ = nullptr;
-static OpenSCManager_t OpenSCManager_ = nullptr;
-static OpenService_t OpenService_ = nullptr;
-static QueryServiceStatus_t QueryServiceStatus_ = nullptr;
-static StartService_t StartService_ = nullptr;
-
const wchar_t * const INDEXING_SERVICE_NAME = L"cisvc";
bool StopIndexingService(SC_HANDLE hService)
{
SERVICE_STATUS status;
-if (ControlService_(hService, SERVICE_CONTROL_STOP, &status))
+if (ControlService(hService, SERVICE_CONTROL_STOP, &status))
{
// Check the status until the service is no longer stop pending.
-if (QueryServiceStatus_(hService, &status))
+if (QueryServiceStatus(hService, &status))
{
DWORD startTime = GetTickCount();
DWORD oldCheckPoint = status.dwCheckPoint;
@@ -77,7 +59,7 @@ bool StopIndexingService(SC_HANDLE hService)
Sleep(waitTime);
// Check the status again.
-if (!QueryServiceStatus_(hService, &status) ||
+if (!QueryServiceStatus(hService, &status) ||
(status.dwCurrentState == SERVICE_STOPPED))
break;
@@ -98,12 +80,12 @@ bool StopIndexingService(SC_HANDLE hService)
void StartIndexingService(SC_HANDLE hService)
{
-if (StartService_(hService, 0, nullptr))
+if (StartServiceW(hService, 0, nullptr))
{
SERVICE_STATUS status;
// Check the status until the service is no longer stop pending.
-if (QueryServiceStatus_(hService, &status))
+if (QueryServiceStatus(hService, &status))
{
DWORD startTime = GetTickCount();
DWORD oldCheckPoint = status.dwCheckPoint;
@@ -123,7 +105,7 @@ void StartIndexingService(SC_HANDLE hService)
Sleep(waitTime);
// Check the status again.
-if (!QueryServiceStatus_(hService, &status) ||
+if (!QueryServiceStatus(hService, &status) ||
(status.dwCurrentState == SERVICE_STOPPED))
break;
@@ -144,32 +126,14 @@ void StartIndexingService(SC_HANDLE hService)
extern "C" UINT __stdcall RestartIndexingService(MSIHANDLE)
{
-HMODULE hAdvapi32 = LoadLibraryW(L"advapi32.dll");
-
-if (hAdvapi32)
-{
-CloseServiceHandle_ =
reinterpret_cast(GetProcAddress(hAdvapi32,
"CloseServiceHandle"));
-ControlService_ =
reinterpret_cast(GetProcAddress(hAdvapi32, "ControlService"));
-OpenSCManager_ =
reinterpret_cast(GetProcAddress(hAdvapi32, "OpenSCManagerW"));
-OpenService_ =
reinterpret_cast(GetProcAddress(hAdvapi32, "OpenServiceW"));
-QueryServiceStatus_ =
reinterpret_cast(GetProcAddress(hAdvapi32,
"QueryServiceStatus"));
-StartService_ =
reinterpret_cast(GetProcAddress(hAdvapi32, "StartServiceW"));
-}
-
-/* On sy
