David Tardon
12 years ago
parent
36c910ed1a
commit
99aa030795
@ -1,56 +0,0 @@
|
|||||||
From 3460b450a13fac7a37cd753e6858b18cbb69ff7f Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Fri, 9 Aug 2013 11:40:25 +0100
|
|
||||||
Subject: [PATCH] Resolves: fdo#67743 user autocorr file not written
|
|
||||||
|
|
||||||
regression since c9c2fbe485de2bb831bd2e58faef87a19ceff622
|
|
||||||
|
|
||||||
revert the logic change and keep the OUString conversion
|
|
||||||
|
|
||||||
Change-Id: Ia4f8c3be2b6e325122ae7b21c431c301b8afecad
|
|
||||||
(cherry picked from commit d2c3297eed9917c110da67b2a4c19265aecb38ed)
|
|
||||||
---
|
|
||||||
editeng/source/misc/svxacorr.cxx | 13 ++++++++-----
|
|
||||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
|
|
||||||
index e7a3d31..7be7da1 100644
|
|
||||||
--- a/editeng/source/misc/svxacorr.cxx
|
|
||||||
+++ b/editeng/source/misc/svxacorr.cxx
|
|
||||||
@@ -1545,7 +1545,9 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi
|
|
||||||
{
|
|
||||||
OSL_ENSURE(pLangTable->find(eLang) == pLangTable->end(), "Language already exists ");
|
|
||||||
|
|
||||||
- OUString sShareDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False ));
|
|
||||||
+ OUString sUserDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False ));
|
|
||||||
+ OUString sShareDirFile( sUserDirFile );
|
|
||||||
+
|
|
||||||
SvxAutoCorrectLanguageListsPtr pLists = 0;
|
|
||||||
|
|
||||||
Time nMinTime( 0, 2 ), nAktTime( Time::SYSTEM ), nLastCheckTime( Time::EMPTY );
|
|
||||||
@@ -1559,17 +1561,18 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi
|
|
||||||
// 2 minutes.
|
|
||||||
if( bNewFile )
|
|
||||||
{
|
|
||||||
- pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sShareDirFile );
|
|
||||||
+ sShareDirFile = sUserDirFile;
|
|
||||||
+ pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sUserDirFile );
|
|
||||||
pLangTable->insert(eLang, pLists);
|
|
||||||
aLastFileTable.erase(nFndPos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- else if( ( FStatHelper::IsDocument( sShareDirFile ) ||
|
|
||||||
+ else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
|
|
||||||
FStatHelper::IsDocument( sShareDirFile =
|
|
||||||
GetAutoCorrFileName( eLang, sal_False, sal_False ) ) ) ||
|
|
||||||
- ( sShareDirFile = sShareDirFile, bNewFile ))
|
|
||||||
+ ( sShareDirFile = sUserDirFile, bNewFile ))
|
|
||||||
{
|
|
||||||
- pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sShareDirFile );
|
|
||||||
+ pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sUserDirFile );
|
|
||||||
pLangTable->insert(eLang, pLists);
|
|
||||||
if (nFndPos != aLastFileTable.end())
|
|
||||||
aLastFileTable.erase(nFndPos);
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
From 0aa3a73c9463f4d1e8918383b21131352635fe75 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Tue, 20 Aug 2013 14:25:22 +0100
|
|
||||||
Subject: [PATCH] Resolves: rhbz#998136 different index to gWidgetData vs
|
|
||||||
NWEnsureGTKNotebook
|
|
||||||
|
|
||||||
Change-Id: Ib3ebbfda09cd05477b65c1d81ac77e977b2a11e5
|
|
||||||
---
|
|
||||||
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
|
|
||||||
index c88bc6f..e3bff2a 100644
|
|
||||||
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
|
|
||||||
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
|
|
||||||
@@ -1607,8 +1607,8 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect )
|
|
||||||
w = aAreaRect.GetWidth();
|
|
||||||
h = aAreaRect.GetHeight();
|
|
||||||
|
|
||||||
- gint xthickness = gWidgetData[0].gNotebookWidget->style->xthickness;
|
|
||||||
- gint ythickness = gWidgetData[0].gNotebookWidget->style->ythickness;
|
|
||||||
+ gint xthickness = gWidgetData[nScreen].gNotebookWidget->style->xthickness;
|
|
||||||
+ gint ythickness = gWidgetData[nScreen].gNotebookWidget->style->ythickness;
|
|
||||||
|
|
||||||
x -= xthickness;
|
|
||||||
y -= ythickness;
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From b568989dbd436fae841a260530c048293abce396 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Mon, 26 Nov 2012 14:22:00 +0100
|
|
||||||
Subject: [PATCH] temporarily disable failing test
|
|
||||||
|
|
||||||
Change-Id: I35779dee97cfdde25e33724e61edef8a65694428
|
|
||||||
---
|
|
||||||
sdext/Module_sdext.mk | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
|
|
||||||
index 2d506be..648cafa 100644
|
|
||||||
--- a/sdext/Module_sdext.mk
|
|
||||||
+++ b/sdext/Module_sdext.mk
|
|
||||||
@@ -50,7 +50,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
|
|
||||||
))
|
|
||||||
|
|
||||||
$(eval $(call gb_Module_add_check_targets,sdext,\
|
|
||||||
- CppunitTest_pdfimport \
|
|
||||||
Executable_pdf2xml \
|
|
||||||
Executable_pdfunzip \
|
|
||||||
))
|
|
||||||
--
|
|
||||||
1.8.0
|
|
||||||
|
|
||||||
Loading…
Reference in new issue