[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source
editeng/source/misc/svxacorr.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d4c6057486f9667e82d7d4810bb2d421071b0eb2
Author: Julien Nabet
AuthorDate: Wed Mar 6 22:01:15 2019 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 8 10:54:36 2019 +0100
tdf#121686: fix assert in SvxAutoCorrect::FnChgToEnEmDash (editeng)
See https://bugs.documentfoundation.org/attachment.cgi?id=149773
Change-Id: I1696984a8df1b38a359a8177a5f3670526d2696e
Reviewed-on: https://gerrit.libreoffice.org/68832
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 67d170868401335434772f1be23d565d23c1fbea)
Reviewed-on: https://gerrit.libreoffice.org/68882
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b890b5cd0984..737225d31615 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -542,7 +542,8 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
sal_Unicode cCh = rTxt[ nSttPos ];
if( '-' == cCh )
{
-if( ' ' == rTxt[ nSttPos-1 ] &&
+if( 1 < nEndPos - nSttPos &&
+' ' == rTxt[ nSttPos-1 ] &&
'-' == rTxt[ nSttPos+1 ])
{
sal_Int32 n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source
editeng/source/editeng/impedit3.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6a25245b37437e66f501338f17d6b54825a266d3
Author: AlicVB
AuthorDate: Wed Oct 17 22:03:24 2018 +0200
Commit: Christian Lohmaier
CommitDate: Wed Nov 28 22:47:59 2018 +0100
tdf#120525 fix linespacing <100% for impress
apply linespacing changes even for fonts with big descent values
Change-Id: If1763da1ea015822d90a5c7410ca90dcaa71d22f
Reviewed-on: https://gerrit.libreoffice.org/61894
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 87239dbf7d57d812cdecbf75f6e86afaa4864abb)
Reviewed-on: https://gerrit.libreoffice.org/64190
Reviewed-by: Christian Lohmaier
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 7cc6dfddb695..fc383b9555ad 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1451,10 +1451,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara,
sal_uInt32 nStartPosY )
sal_uInt16 nNewAscent = pLine->GetTxtHeight() *
nPropLineSpace / 100 * 4 / 5; // 80%
if ( !nAscent || nAscent > nNewAscent )
{
-sal_uInt16 nHeight = pLine->GetHeight() *
nPropLineSpace / 100;
-pLine->SetHeight( nHeight, pLine->GetTxtHeight() );
pLine->SetMaxAscent( nNewAscent );
}
+sal_uInt16 nHeight = pLine->GetHeight() * nPropLineSpace /
100;
+pLine->SetHeight( nHeight, pLine->GetTxtHeight() );
}
else if ( rLSItem.GetPropLineSpace() && (
rLSItem.GetPropLineSpace() != 100 ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source
editeng/source/rtf/svxrtf.cxx | 16 +---
1 file changed, 1 insertion(+), 15 deletions(-)
New commits:
commit 86b30f05b41e751ca144796b61243e2ecaf56324
Author: Caolán McNamara
AuthorDate: Thu Nov 8 12:20:25 2018 +
Commit: Xisco Faulí
CommitDate: Fri Nov 9 14:22:09 2018 +0100
Resolves: tdf#121200 Revert "ofz#7802 infinite loop"
This reverts commit 409441652af3df62e742b9d7a3d80cb6b15214af.
Change-Id: Ifa7b5437a1d9024466f5769b14ad67ed8777e04a
Reviewed-on: https://gerrit.libreoffice.org/63093
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 88a3a1c110bf..369995b1d293 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -356,10 +356,7 @@ void SvxRTFParser::ReadStyleTable()
case RTF_CHRFMT:
case RTF_BRDRDEF:
case RTF_TABSTOPDEF:
-#ifndef NDEBUG
-auto nEnteringToken = nToken;
-#endif
-auto nEnteringIndex = m_nTokenIndex;
+
if( RTF_SWGDEFS & nToken)
{
if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId )
@@ -371,17 +368,6 @@ void SvxRTFParser::ReadStyleTable()
}
}
ReadAttr( nToken, >aAttrSet );
-if (m_nTokenIndex == nEnteringIndex - 1)
-{
-// we called SkipToken to go back one, but
-// ReadAttrs read nothing, so on next loop
-// of outer while we would end up in the
-// same state again (assert that)
-assert(nEnteringToken == GetNextToken());
-// and loop endlessly, skip format a token
-// instead to avoid that
-SkipToken(1);
-}
break;
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source
editeng/source/editeng/impedit2.cxx |7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) New commits: commit a9558457643af2c978a86ce1c744886d983a162d Author: Mark Hung AuthorDate: Mon Oct 8 21:49:44 2018 +0800 Commit: Michael Stahl CommitDate: Sat Oct 27 19:07:42 2018 +0200 tdf#119065 fix the style of two connected paragraphs. Invoke ImpConnectParagraphs with bSpecialBackward set to false by default in DeleteLeftOrRight(). Old design connect backward when pressing backspace to connect two paragraphs. The former paragraph of the two ( or the remain one ) adopt the paragraph style ( bullet on/off status, color, etc. ) from the later paragraph. It's hard to understand the intention of the original design, and the design was not activated until LibreOffice6.1, hence just don't connect backward anymore. Change-Id: I3697acc01d718d7a769fb8d0bd573084c4fe2969 Reviewed-on: https://gerrit.libreoffice.org/61537 Tested-by: Jenkins Reviewed-by: Mark Hung (cherry picked from commit 53d900fb334b2ce08ff19de0f765108e8c91a36f) Reviewed-on: https://gerrit.libreoffice.org/61701 Reviewed-by: Michael Stahl diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 39192121fcf0..cd48e92ad4c9 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2390,12 +2390,7 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n if ( ( nDelMode == DeleteMode::RestOfContent ) || ( aDelStart.GetNode() == aDelEnd.GetNode() ) ) return ImpDeleteSelection( EditSelection( aDelStart, aDelEnd ) ); -// Decide now if to delete selection (RESTOFCONTENTS) -bool bSpecialBackward = ( nMode == DEL_LEFT ) && ( nDelMode == DeleteMode::Simple ); -if ( aStatus.IsAnyOutliner() ) -bSpecialBackward = false; - -return ImpConnectParagraphs( aDelStart.GetNode(), aDelEnd.GetNode(), bSpecialBackward ); +return ImpConnectParagraphs(aDelStart.GetNode(), aDelEnd.GetNode()); } EditPaM ImpEditEngine::ImpDeleteSelection(const EditSelection& rCurSel) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source sw/source
editeng/source/items/frmitems.cxx |3 ++-
sw/source/core/unocore/unoidx.cxx |6 ++
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 18a388c696567e6ddbf8c997ee0a9a686e7d80ed
Author: Michael Stahl
AuthorDate: Fri Oct 12 16:37:32 2018 +0200
Commit: Michael Meeks
CommitDate: Thu Oct 25 10:33:30 2018 +0200
editeng: do not throw from QueryValue implementation
None of the other QueryValue throw; in case of a problem they return
false without initialising the Any.
On the one hand, it would be useful to throw an exception for this
special property that has now become Write-Only, so that API users
get a better hint what is going wrong; on the other hand, it breaks
various other things like the various multi-property interfaces that
call QueryValue for multiple items (there are 3 such loops in
SwAccessibleParagraph alone).
(throw was introduced in 7a8ed362eb163ac15a000ba1cfc74b58315800a1)
It turns out there is even a test for the exception on ToX.
Change-Id: Id60ff43544f7399ce869227bfd6fb933dbaea3be
Reviewed-on: https://gerrit.libreoffice.org/61719
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
Signed-off-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/62331
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index d5c2e7aea47b..e3ca3a125595 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3316,7 +3316,8 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
case MID_GRAPHIC_URL:
{
-throw uno::RuntimeException("Getting from this property is not
supported");
+SAL_INFO("editeng.items", "Getting GraphicURL property is not
supported");
+return false;
}
break;
case MID_GRAPHIC:
diff --git a/sw/source/core/unocore/unoidx.cxx
b/sw/source/core/unocore/unoidx.cxx
index f2550b36fa23..76f4faf3e09b 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -886,6 +887,11 @@ SwXDocumentIndex::getPropertyValue(const OUString&
rPropertyName)
"Unknown property: " + rPropertyName,
static_cast< cppu::OWeakObject * >(this));
}
+// TODO: is this the best approach to tell API clients about the change?
+if (pEntry->nWID == RES_BACKGROUND && pEntry->nMemberId == MID_GRAPHIC_URL)
+{
+throw uno::RuntimeException("Getting GraphicURL property is not
supported");
+}
SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
SwTOXBase* pTOXBase = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source svx/source sw/source
editeng/source/items/frmitems.cxx |2 +-
svx/source/unodraw/unoshap2.cxx |2 +-
sw/source/core/unocore/unoframe.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5321ac6c3d925e6f8e380fa3c60e99237a6b5c82
Author: Julien Nabet
AuthorDate: Fri Aug 31 07:32:43 2018 +0200
Commit: Tomaž Vajngerl
CommitDate: Fri Aug 31 13:24:20 2018 +0200
Fix syntax
Change-Id: I21cca2e5cd81ee58a59fda077ed40ba02d9f1df3
Reviewed-on: https://gerrit.libreoffice.org/59844
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 49d1a2f70bb8c099f1a950e5ad9f805d252ea342)
Reviewed-on: https://gerrit.libreoffice.org/59847
Reviewed-by: Tomaž Vajngerl
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 0813021dd4e3..d5c2e7aea47b 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3316,7 +3316,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
case MID_GRAPHIC_URL:
{
-throw uno::RuntimeException("Getting from this property is not
unsupported");
+throw uno::RuntimeException("Getting from this property is not
supported");
}
break;
case MID_GRAPHIC:
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index fbed04557448..571145c62a4b 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1549,7 +1549,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const
OUString& rName, const SfxIte
case OWN_ATTR_GRAPHIC_URL:
{
-throw uno::RuntimeException("Getting from this property is not
unsupported");
+throw uno::RuntimeException("Getting from this property is not
supported");
break;
}
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index c3d409e02fec..663b13162498 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2055,7 +2055,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString&
rPropertyName)
}
else if( FN_UNO_GRAPHIC_URL == pEntry->nWID )
{
-throw uno::RuntimeException("Getting from this property is not
unsupported");
+throw uno::RuntimeException("Getting from this property is not
supported");
}
else if( FN_UNO_GRAPHIC == pEntry->nWID )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source include/editeng
editeng/source/items/textitem.cxx | 12
include/editeng/rsiditem.hxx |5 +
2 files changed, 17 insertions(+)
New commits:
commit bd64800ef579b5d4653ee3dfb90c45874a15a9fa
Author: Caolán McNamara
AuthorDate: Thu Aug 23 16:15:58 2018 +0100
Commit: Michael Stahl
CommitDate: Fri Aug 24 10:57:45 2018 +0200
Resolves: tdf#112563 we don't want a human representation of SvxRsidItem
Change-Id: I6a57440b08258ddcbfaa955a62c4963a83193115
Reviewed-on: https://gerrit.libreoffice.org/59516
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index 7ef82e39ec98..5be7bcf9a2db 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3053,6 +3053,18 @@ SfxPoolItem* SvxRsidItem::Clone( SfxItemPool * ) const
return new SvxRsidItem( *this );
}
+bool SvxRsidItem::GetPresentation
+(
+SfxItemPresentation /*ePres*/,
+MapUnit /*eCoreUnit*/,
+MapUnit /*ePresUnit*/,
+OUString& rText, const IntlWrapper& /*rIntl*/
+) const
+{
+rText.clear();
+return false;
+}
+
void SvxRsidItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("SvxRsidItem"));
diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx
index ab1e23a6c618..4ace56e17e24 100644
--- a/include/editeng/rsiditem.hxx
+++ b/include/editeng/rsiditem.hxx
@@ -21,6 +21,11 @@ class EDITENG_DLLPUBLIC SvxRsidItem : public SfxUInt32Item
public:
SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId,
nRsid ) {}
+virtual bool GetPresentation( SfxItemPresentation ePres,
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString , const IntlWrapper& ) const
override;
+
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 )
const override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source
editeng/source/editeng/impedit4.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3b07dfad5df6d7117d6bd29aa30245a6dc515379
Author: Julien Nabet
AuthorDate: Wed Aug 8 22:58:43 2018 +0200
Commit: Caolán McNamara
CommitDate: Mon Aug 13 17:10:18 2018 +0200
tdf#119155, tdf#119162: check there's at least 1 word in Capitalize Every
Word
See https://bugs.documentfoundation.org/show_bug.cgi?id=119155#c4
+ https://bugs.documentfoundation.org/attachment.cgi?id=144036
Change-Id: Id2cb05b3c83069b031a8be73cf0a4ec774d94d7e
Reviewed-on: https://gerrit.libreoffice.org/58936
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index e2f7e2412dd0..88907003ab36 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2759,7 +2759,7 @@ EditSelection ImpEditEngine::TransliterateText( const
EditSelection& rSelection,
}
i18n::Boundary aCurWordBndry( aSttBndry );
-while (aCurWordBndry.startPos <= aEndBndry.startPos)
+while (aCurWordBndry.endPos && aCurWordBndry.startPos <=
aEndBndry.startPos)
{
nCurrentStart = aCurWordBndry.startPos;
nCurrentEnd = aCurWordBndry.endPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source
editeng/source/editeng/impedit2.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 22b9bee790a6b63b11369a7ae7257ceaef9d8585
Author: Noel Grandin
AuthorDate: Fri Aug 10 16:43:11 2018 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 11 11:49:21 2018 +0200
tdf#119169 impress, crash when editing bulleted list
regression from
commit e278df1a14c5cb5dbb7add5d6ed5dd52da131e92
tdf#108608 Draw file unresponsive on large text pasted into textbox
Somewhere up in the accessibility code it has a stale paragraph index.
Judging up other code in this class, that is fairly common, so just add
similar safety checks.
The old code (pre-regression) only worked because it iterated over all
paragraphs, and it just ignored the paragraph index.
Change-Id: I51c573b95f976fa87228e4f7e9f33bd6ea0dc3c8
Reviewed-on: https://gerrit.libreoffice.org/58836
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 36a2af004e1a7b17a71d8327c7ae2b6091ab0ffa)
Reviewed-on: https://gerrit.libreoffice.org/58855
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 4bd83aa6e644..7e8fb846136a 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3110,8 +3110,9 @@ sal_uInt32 ImpEditEngine::CalcParaWidth( sal_Int32 nPara,
bool bIgnoreExtraSpace
// Over all the paragraphs ...
+OSL_ENSURE( 0 <= nPara && nPara < GetParaPortions().Count(),
"CalcParaWidth: Out of range" );
ParaPortion* pPortion = GetParaPortions()[nPara];
-if ( pPortion->IsVisible() )
+if ( pPortion && pPortion->IsVisible() )
{
const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pPortion->GetNode() );
sal_Int32 nSpaceBeforeAndMinLabelWidth =
GetSpaceBeforeAndMinLabelWidth( pPortion->GetNode() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source
editeng/source/editeng/impedit2.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 19d6d196c9bc70f7a5938c89830b57dbdcfb8801
Author: Paul Trojahn
AuthorDate: Mon Jul 9 20:36:09 2018 +0200
Commit: Caolán McNamara
CommitDate: Sat Jul 28 16:48:02 2018 +0200
tdf#115438 Fix freeze when pasting unformatted text
ImpConnectParagraphs calls TextModified, which calculates the selection
rectangles of
the paragraph for accessibility services by calling DrawSelectionXOR. When
calling ImpConnectParagraphs from ImpDeleteSelection, the selection isn't
valid, because UpdateSelection wasn't called yet. DrawSelectionXOR ends up
freezing the application, because pEndNode isn't valid.
This can be fixed by calling EnterBlockNotifications, to deliver the
notification
sent by TextModified when the insertion is done.
Change-Id: Ia3a0e5b59a28f3503cbc54da682fcdaa5af277be
Reviewed-on: https://gerrit.libreoffice.org/57286
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 65eaebd2879c18926d4672c9276ef7f73f87af99)
Reviewed-on: https://gerrit.libreoffice.org/58136
Tested-by: Jenkins
Reviewed-by: Paul Trojahn
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 4c2c0c73a3e4..4bd83aa6e644 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -614,7 +614,9 @@ bool ImpEditEngine::MouseMove( const MouseEvent& rMEvt,
EditView* pView )
EditPaM ImpEditEngine::InsertText(const EditSelection& aSel, const OUString&
rStr)
{
+EnterBlockNotifications();
EditPaM aPaM = ImpInsertText( aSel, rStr );
+LeaveBlockNotifications();
return aPaM;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1706ed7334461420274584b875ae6ab209f4dad9
Author: Xisco Fauli
AuthorDate: Mon Jul 23 22:00:25 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Jul 24 15:16:53 2018 +0200
tdf#118517: Use xStg before resetting it
Regression from 0f166ef5240ee155bf2544e6bc3c985b1e3bf646
Change-Id: I083951700895a00be8d4407871c27804ca3e5f30
Reviewed-on: https://gerrit.libreoffice.org/57881
Reviewed-by: Julien Nabet
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
(cherry picked from commit a61d61f66f80c91c14825f8fe8fb9bd3f295591b)
Reviewed-on: https://gerrit.libreoffice.org/57906
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 556f60b9c426..b890b5cd0984 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2568,9 +2568,9 @@ void SvxAutoCorrectLanguageLists::PutText( const
OUString& rShort,
try
{
uno::Reference < embed::XStorage > xStg =
comphelper::OStorageHelper::GetStorageFromURL( sUserAutoCorrFile,
embed::ElementModes::READWRITE );
+bool bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort,
rShell, sLong );
xStg = nullptr;
-bool bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort,
rShell, sLong );
// Update the word list
if( bRet )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source include/svtools linguistic/source
editeng/source/misc/unolingu.cxx |7 ++-
include/svtools/strings.hrc |2 +-
linguistic/source/dicimp.cxx |6 --
linguistic/source/dlistimp.cxx |5 -
linguistic/source/misc.cxx |7 ++-
5 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit ef32eff2fb9b4c00a1518b8cf4cae8433d564c61
Author: Gabor Kelemen
Date: Wed Jun 20 08:14:20 2018 +0200
tdf#117620 Localize the temporary IgnoreAllList dictionarys name
Also give it a human readable original name
Change-Id: I86060badac145e7b60cf7dc2e67e16e7c84c2837
Reviewed-on: https://gerrit.libreoffice.org/56143
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Tested-by: Heiko Tietze
(cherry picked from commit eff395c2d2a3026d9d65121e273af336fb0cfb19)
Reviewed-on: https://gerrit.libreoffice.org/56446
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 6263a0db5398..25e7268a93e0 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -49,6 +49,8 @@
#include
#include
#include
+#include
+#include
using namespace ::comphelper;
using namespace ::linguistic;
@@ -594,7 +596,10 @@ uno::Reference< XDictionary > LinguMgr::GetIgnoreAll()
uno::Reference< XSearchableDictionaryList > xTmpDicList(
GetDictionaryList() );
if (xTmpDicList.is())
{
-xIgnoreAll.set( xTmpDicList->getDictionaryByName( "IgnoreAllList" ),
UNO_QUERY );
+std::locale loc(Translate::Create("svt"));
+xIgnoreAll.set( xTmpDicList->getDictionaryByName(
+
Translate::get(STR_DESCRIPTION_IGNOREALLLIST, loc) ),
+UNO_QUERY );
}
return xIgnoreAll;
}
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index b5d7b8bb9655..a616b2a6bd56 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -358,7 +358,7 @@
#define STR_DESCRIPTION_HUNSPELL
NC_("STR_DESCRIPTION_HUNSPELL", "Hunspell SpellChecker")
#define STR_DESCRIPTION_LIBHYPHEN
NC_("STR_DESCRIPTION_LIBHYPHEN", "Libhyphen Hyphenator")
#define STR_DESCRIPTION_MYTHES NC_("STR_DESCRIPTION_MYTHES",
"Mythes Thesaurus")
-
+#define STR_DESCRIPTION_IGNOREALLLIST
NC_("STR_DESCRIPTION_IGNOREALLLIST", "List of Ignored Words")
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 12c82f461401..ddc5074f62c7 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -75,12 +75,6 @@ using namespace linguistic;
// The following fake file name extension will be
// added to the text of the title: field for correct
// text stripping and dictionary saving.
-//
-// TODO: add translation support?
-// tdf#50827 language dependent wordlists are already in
-// the appropriate dict packages.
-// Note: Also name of the special run-time dictionary
-// "IgnoreAllList" hasn't been localized yet.
#define EXTENSION_FOR_TITLE_TEXT "."
static const sal_Char* const pVerStr2= "WBSWG2";
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 5aade2b9e02e..e1b92d4a41a1 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -37,6 +37,8 @@
#include
#include
#include
+#include
+#include
#include "defs.hxx"
#include "dlistimp.hxx"
@@ -611,8 +613,9 @@ void DicList::CreateDicList()
// create IgnoreAllList dictionary with empty URL (non persistent)
// and add it to list
+std::locale loc(Translate::Create("svt"));
uno::Reference< XDictionary > xIgnAll(
-createDictionary( "IgnoreAllList", LinguLanguageToLocale(
LANGUAGE_NONE ),
+createDictionary( Translate::get(STR_DESCRIPTION_IGNOREALLLIST,
loc), LinguLanguageToLocale( LANGUAGE_NONE ),
DictionaryType_POSITIVE, OUString() ) );
if (xIgnAll.is())
{
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index ac0f508751d3..6582c91db586 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -38,6 +38,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -741,7 +743,10 @@ uno::Reference< XDictionary > GetIgnoreAllList()
uno::Reference< XDictionary > xRes;
uno::Reference< XSearchableDictionaryList > xDL( GetDictionaryList() );
if (xDL.is())
-xRes = xDL->getDictionaryByName( "IgnoreAllList" );
+{
+std::locale loc(Translate::Create("svt"));
+xRes = xDL->getDictionaryByName(
Translate::get(STR_DESCRIPTION_IGNOREALLLIST, loc) );
+}
return xRes;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
