basic/source/runtime/methods.cxx | 6 +++++-
desktop/source/app/cmdlineargs.cxx | 9 +++++++++
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 2 +-
svx/source/svdraw/svdedxv.cxx | 2 +-
svx/source/table/tablecontroller.cxx | 2 +-
svx/source/table/tablemodel.cxx | 2 +-
sw/source/ui/shells/textsh1.cxx | 2 +-
7 files changed, 19 insertions(+), 6 deletions(-)
New commits:
commit b1670e2ebe56209f94b84443e1f79c1460f06320
Author: jorendc <joren.libreoff...@telenet.be>
Date: Mon Jan 7 14:35:51 2013 +0100
typo fix
Change-Id: I7530e477a6cf4ab52772b7ba1c5e3d41dc2d6fae
Reviewed-on: https://gerrit.libreoffice.org/1563
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 2001cb9db7e1d13e8bd142fa99c51aa5f96174f2)
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 4d11e48..50f76cf 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -259,7 +259,7 @@
</node>
<node oor:name="H_MOD1" oor:op="replace" install:module="unxwnt">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS
- NO TRANSLATE</value>
- <value xml:lang="en-US">.uno.SearchDialog</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
</prop>
</node>
<node oor:name="N_MOD1" oor:op="replace">
commit 5e13f102b85253d44325f976b3717cae79232875
Author: K_Karthikeyan <karthike...@kacst.edu.sa>
Date: Mon Jan 7 13:56:08 2013 +0300
Bugfix for improper function call, column count was compared with row count
Change-Id: Iacf59548209d2be8b36839ae12bed9cedb7bdded
Reviewed-on: https://gerrit.libreoffice.org/1562
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit aaaa5350075ad5f589c242ec40f9f6ab7fe822a5)
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 46b1c9a..93ebc58 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1116,7 +1116,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow,
sal_Int32 nColSpan, sal_
const sal_Int32 nLastRow = nRow + nRowSpan;
const sal_Int32 nLastCol = nCol + nColSpan;
- if( (nLastRow > getRowCount()) || (nLastCol > getRowCount() ) )
+ if( (nLastRow > getRowCount()) || (nLastCol > getColumnCount() ) )
{
OSL_FAIL("TableModel::merge(), merge beyound the table!");
}
commit 96b985145b3efbaf4552adbeccf24bfac2fa71b0
Author: Christopher Copits <chrisc...@live.com>
Date: Tue Jan 1 16:29:32 2013 -0500
fdo#53521 Crash when running BASIC's "shell()" with a non-existent program
The problem is that the process handle is freed regardless of whether
osl_executeProcess was successful or not. Therefore, a segmentation fault would
result, as a random memory address would be freed. This patch checks whether
osl_executeProcess was successful. If it was, then it frees the handle; if it
wasn't successful, the memory is not freed.
Change-Id: Ic3af07be06e7af7730a3bcb1680c659a88b66af3
Reviewed-on: https://gerrit.libreoffice.org/1530
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit dbfc8777bf73872d1b96f956b9e778d9099d52b3)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 6c17234..e09f447 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3527,7 +3527,11 @@ RTLFUNC(Shell)
NULL, 0,
&pApp ) == osl_Process_E_None;
- osl_freeProcessHandle( pApp );
+ // 53521 only free process handle on success
+ if (bSucc)
+ {
+ osl_freeProcessHandle( pApp );
+ }
for(int j = 0; i < nParamCount; i++)
{
commit 02369ca82db8326058d38403c91185fdeb7311d8
Author: Werner Koerner <wk66...@gmail.com>
Date: Sat Dec 29 13:24:20 2012 +0100
Fix wrong bracketing
Wrong bracketing, item is put at a which-id of sal_false.
Change-Id: Ic4216519d74de75690b21a3efa5083e79aa5b83d
Reviewed-on: https://gerrit.libreoffice.org/1498
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 06bdc1e3ae8e93154dc9b9487691b547348c8634)
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1124d51..c351e38 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1426,7 +1426,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case FN_GLOSSARY_DLG:
{
- rSet.Put(SfxBoolItem(nWhich), sal_True);
+ rSet.Put( SfxBoolItem( nWhich, sal_True ) );
}
break;
commit abf0ed8400d7787fec906b21de74698936d40e28
Author: Aurimas Fišeras <auri...@members.fsf.org>
Date: Sun Dec 16 13:41:31 2012 +0200
fdo#57203 Unknown option: -Embedding
Ignore this option on Windows.
This work-arounds a regression introduced by f4a4ba9ac
Windows appends -Embedding when LibreOffice is called by COM+
Before f4a4ba9ac this option was silently ignored.
Change-Id: I8a727895c9ec8fa4b06aea8ad66b2791ada66dd5
Reviewed-on: https://gerrit.libreoffice.org/1514
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 3616640054f4fc18c6e7307ba17e7d89a0f5ae69)
Conflicts:
desktop/source/app/cmdlineargs.cxx
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 2320a18..f5016e3 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -502,6 +502,15 @@ bool CommandLineArgs::InterpretCommandLineParameter( const
::rtl::OUString& aArg
return true;
}
#endif
+#ifdef WIN32
+ /* fdo#57203 ignore -Embedding on Windows
+ when LibreOffice is launched by COM+
+ */
+ else if ( oArg == "Embedding" )
+ {
+ return true;
+ }
+#endif
else if (
oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter=")))
{
m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")));
commit a59e6dc3688c75184ea89b690333b1fd28408fae
Author: Werner Koerner <wk66...@gmail.com>
Date: Sat Dec 29 13:53:01 2012 +0100
Fix calls to SfxPoolItem* Put with a Which-ID of sal_false
Change-Id: I39914909fd394532e7a32c791d4480530393c1c0
Reviewed-on: https://gerrit.libreoffice.org/1499
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 475469626b3a92528a9584d6c34f2b44b7eb8d1c)
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 10d4736..f047b78 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1348,7 +1348,7 @@ sal_Bool SdrObjEditView::GetAttributes(SfxItemSet&
rTargetSet, sal_Bool bOnlyHar
{
// FALSE= regard InvalidItems as "holes," not as Default
rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
- rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
+ rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ) );
}
if(GetMarkedObjectCount()==1 &&
GetMarkedObjectByIndex(0)==mxTextEditObj.get())
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index a0050c3..9368675 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2340,7 +2340,7 @@ bool SvxTableController::GetAttributes(SfxItemSet&
rTargetSet, bool bOnlyHardAtt
{
// FALSE= InvalidItems nicht al Default, sondern als "Loecher"
betrachten
rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
- rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
+ rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ) );
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
