[Libreoffice-commits] .: Branch 'feature/gbuild_java' - 2 commits - jvmfwk/inc jvmfwk/Library_sunjavaplugin.mk jvmfwk/Package_inc.mk postprocess/rebase solenv/bin ure/source
jvmfwk/Library_sunjavaplugin.mk|4 +++
jvmfwk/Package_inc.mk |1
jvmfwk/inc/jvmfwk/framework.h |2 -
jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h | 44 +
jvmfwk/inc/jvmfwk/vendorplugin.h |9 +++---
postprocess/rebase/coffbase.txt|2 -
solenv/bin/linkoo |2 -
ure/source/README |4 +--
8 files changed, 59 insertions(+), 9 deletions(-)
New commits:
commit 3c29bf2260bb3d982a72c755df5ae10845a62110
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 26 10:47:24 2011 +0100
sunjavaplugin has been renamed
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 6119c53..0326309 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -143,7 +143,7 @@ extern C {
p
regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2
-env:quot;UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\jurt.jarquot;
--env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\sunjavaplugin.dll -register
+-env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\libsunjavaplugin.dll
-register
/p
pAdditionall parameters for the Java VM can be provided. For every
parameter
a seperate bootstrap parameter must be specified. The names are
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index ea7f867..7c6961a 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -271,7 +271,7 @@ store3.dll 0x5e2e 0x0002
streams.uno.dll 0x5e2b 0x0002
stringresourcemi.uno.dll 0x5e28 0x0002
stsmi.dll0x5e1f 0x0008
-sunjavaplugin.dll 0x5e1c 0x0002
+libsunjavaplugin.dll 0x5e1c 0x0002
svgfiltermi.dll 0x5e19 0x0002
svgmi.dll0x5e16 0x0002
svlmi.dll0x5e09 0x000c
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 3008835..c11a6e9 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -113,7 +113,7 @@ my $brand_program_dir = 'program';
my $ure_lib_dir = 'ure-link/lib';
my $win_ure_lib_dir = 'URE/bin';
-my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
+my @exceptions = ( 'cppuhelper', 'libsunjavaplugin', 'libjvmfwk' );
my $bin;
$bin = |\\.bin if ($TARGET eq 'wntgcci.pro');
diff --git a/ure/source/README b/ure/source/README
index 1463e04..efb88d9 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -68,7 +68,7 @@ Linux x86, Solaris x86, and Solaris SPARC:
/opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3 [private; Linux x86 only]
/opt/openoffice.org/ure/lib/libjvmaccessC52.so.3 [private; Solaris only]
/opt/openoffice.org/ure/lib/libjvmfwk.so.3 [private]
-/opt/openoffice.org/ure/lib/sunjavaplugin.so [private]
+/opt/openoffice.org/ure/lib/libsunjavaplugin.so [private]
/opt/openoffice.org/ure/lib/JREProperties.class [private]
/opt/openoffice.org/ure/lib/jvmfwk3rc [private]
/opt/openoffice.org/ure/lib/libgcc3_uno.so [private; Linux x86 only]
@@ -129,7 +129,7 @@ Program Files\URE\bin\store3.dll [private]
Program Files\URE\bin\xmlreader.dll [private]
Program Files\URE\bin\jvmaccess3MSC.dll [private]
Program Files\URE\bin\jvmfwk3.dll [private]
-Program Files\URE\bin\sunjavaplugin.dll [private]
+Program Files\URE\bin\libsunjavaplugin.dll [private]
Program Files\URE\bin\JREProperties.class [private]
Program Files\URE\bin\jvmfwk3.ini [private]
Program Files\URE\bin\msci_uno.dll [private]
commit eff62d413895d02b92da1a8396cb2bea1ce93902
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 26 10:46:37 2011 +0100
export libsunjavaplugin's API functions
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 6e1a2f6..9ce5461 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_Library_Library,sunjavaplugin))
+$(eval $(call gb_Library_add_defs,sunjavaplugin,\
+-DJVMFWK_PLUGIN_DLLIMPLEMENTATION \
+))
+
ifneq ($(JVM_ONE_PATH_CHECK),)
$(eval $(call gb_Library_add_defs,sunjavaplugin,\
-DJVM_ONE_PATH_CHECK=\$(JVM_ONE_PATH_CHECK)\ \
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
index f8ae7ea..fd8a616 100644
--- a/jvmfwk/Package_inc.mk
+++ b/jvmfwk/Package_inc.mk
@@ -29,6 +29,7 @@ $(eval $(call
gb_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc/jvmfwk))
$(eval $(call
gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,framework.h))
$(eval $(call
gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdllapi.h))
+$(eval $(call
gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkplugindllapi.h,jvmfwkplugindllapi.h))
$(eval $(call
gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
[Libreoffice-commits] .: formula/source fpicker/source
formula/source/core/api/FormulaCompiler.cxx |4 ++--
formula/source/ui/dlg/formula.cxx | 18 +-
formula/source/ui/dlg/funcpage.cxx|2 +-
formula/source/ui/dlg/parawin.cxx |2 +-
fpicker/source/office/OfficeControlAccess.cxx |2 +-
fpicker/source/office/OfficeFilePicker.cxx| 16
fpicker/source/office/OfficeFolderPicker.cxx |2 +-
fpicker/source/office/commonpicker.cxx|8
fpicker/source/office/fpsmartcontent.cxx |2 +-
fpicker/source/office/iodlg.cxx |2 +-
10 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 3e4f51f112248b4e586f5bd86388099737ed17e9
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Sun Dec 25 19:31:22 2011 -0200
Fix for fdo43460 Part XIX getLength() to isEmpty()
Part XIX
Module
formula and fpicker
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index b721c3b..ee6530c 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -296,9 +296,9 @@ uno::Sequence sheet::FormulaToken
FormulaCompiler::OpCodeMap::createSequenceO
// Check for existence not needed here, only name-mapping is of
// interest.
}
-if (!aIntName.getLength())
+if (aIntName.isEmpty())
aIntName = _rCompiler.FindAddInFunction(*pName, !isEnglish());
// bLocalFirst=false for english
-if (!aIntName.getLength())
+if (aIntName.isEmpty())
pToken-OpCode = getOpCodeUnknown();
else
{
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index d298795..4197ae4 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -404,19 +404,19 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent rNEvt )
if(pWin!=NULL)
{
aActivWinId = pWin-GetUniqueId();
-if(aActivWinId.getLength()==0)
+if(aActivWinId.isEmpty())
{
Window* pParent=pWin-GetParent();
while(pParent!=NULL)
{
aActivWinId=pParent-GetUniqueId();
-if(aActivWinId.getLength()!=0) break;
+if(!aActivWinId.isEmpty()) break;
pParent=pParent-GetParent();
}
}
-if(aActivWinId.getLength())
+if(!aActivWinId.isEmpty())
{
FormEditData* pData = m_pHelper-getFormEditData();
@@ -861,7 +861,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool rbNext,
sal_Bool rbPrev)
aFtEditName.Show();
pParaWin-Show();
const rtl::OString aHelpId = pFuncDesc-getHelpId();
-if ( aHelpId.getLength() )
+if ( !aHelpId.isEmpty() )
pMEdit-SetHelpId(aHelpId);
}
@@ -1284,7 +1284,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
sal_uInt16 i;
for(i=0;i=nEd;i++)
{
-if ( m_aArguments[i].getLength() == 0 )
+if ( m_aArguments[i].isEmpty() )
m_aArguments[i] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ));
}
if(pParaWin-GetArgument(nEd).Len()!=0)
@@ -1744,14 +1744,14 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin)
if(pWin-HasFocus())
{
aUniqueId=pWin-GetUniqueId();
-if(aUniqueId.getLength()==0)
+if(aUniqueId.isEmpty())
{
Window* pParent=pWin-GetParent();
while(pParent!=NULL)
{
aUniqueId=pParent-GetUniqueId();
-if(aUniqueId.getLength()!=0) break;
+if(!aUniqueId.isEmpty()) break;
pParent=pParent-GetParent();
}
@@ -1765,7 +1765,7 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin)
{
Window* pChild=pWin-GetChild(i);
aUniqueId=FindFocusWin(pChild);
-if(aUniqueId.getLength()0) break;
+if(!aUniqueId.isEmpty()) break;
}
}
return aUniqueId;
@@ -1885,7 +1885,7 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow*
pCW,
,_pHelper,_pFunctionMgr,_pDlg))
{
FreeResource();
-if(!GetHelpId().getLength())//Hack which hides the HelpId for a model
Dialog in SfxModelessDialog
+if(GetHelpId().isEmpty())//Hack which hides the HelpId for a model
Dialog in SfxModelessDialog
SetHelpId(GetUniqueId()); //and will be changed in a UniqueId,
//at this point we reverse it.
SetText(m_pImpl-aTitle1);
diff --git a/formula/source/ui/dlg/funcpage.cxx
b/formula/source/ui/dlg/funcpage.cxx
index ea3bbaa..22ea529 100644
[Libreoffice-commits] .: Branch 'feature/gbuild_cppuhelper' - scp2/source
scp2/source/ooo/ure.scp |4 1 file changed, 4 deletions(-) New commits: commit 9275d6abf6e76a02d5c45d4a1da070a524263493 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Dec 26 14:19:08 2011 +0100 scp2: cppuhelper is now gbuild'ified diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 09d27aa..aece726 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -191,11 +191,7 @@ End File gid_File_Dl_Cppuhelper LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; -#if defined WNT !defined _MSC // Hack for not gbuild'ified cppuhelper on MinGW: -Name = uno_cppuhelpergcc33.dll -#else Name = SCP2_URE_DL_UNO_COMID_VER(cppuhelper, 3); -#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = D2A191E6-2023-41F5-9032-B98C50C37964; End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/source vcl/unx
sc/source/ui/app/inputhdl.cxx |2 +-
sc/source/ui/view/preview.cxx |4 ++--
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 21223d2be0d7aac9dc07d730f6365ce9c39f5faf
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 26 14:56:25 2011 +0100
fix assertion error in GtkFolderPicker during recovery dialog
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index e8e4578..ec1b0c8 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -89,7 +89,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const
rtl::OUString aDir
OString aTxt = unicodetouri( aDirectory );
-if( aTxt.lastIndexOf('/') == aTxt.getLength() - 1 )
+if( aTxt.lastIndexOf('/') == aTxt.getLength() - 1 !aTxt.isEmpty() )
aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
OSL_TRACE( setting path to %s, aTxt.getStr() );
commit b12191787a4b03549acb2c6dff4946265cc64e77
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 26 14:55:45 2011 +0100
missing pointer check in new multiline input code, fdo#43856
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 7620df7..c0e3cc6 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3413,7 +3413,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState*
pState,
if (pData)
{
pEngine-SetText( *pData );
-if ( pInputWin-IsMultiLineInput() )
+if ( pInputWin pInputWin-IsMultiLineInput() )
aString =
ScEditUtil::GetMultilineString(*pEngine);
else
aString = GetEditText(pEngine);
commit ee154f70a1b6b1c8483e0c66f0f5dc6ad6e576e0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 26 14:54:31 2011 +0100
move OSL_FAIL to correct location
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 1c0d37a..4d72ef9 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -732,8 +732,6 @@ void ScPreview::SetPageNo( long nPage )
long ScPreview::GetFirstPage(SCTAB nTabP)
{
-if (nTabP = static_castSCTAB(nPages.size()) )
-OSL_FAIL(nPages out ouf bounds, FIX IT);
SCTAB nDocTabCount = pDocShell-GetDocument()-GetTableCount();
if (nTabP = nDocTabCount)
nTabP = nDocTabCount-1;
@@ -742,6 +740,8 @@ long ScPreview::GetFirstPage(SCTAB nTabP)
if (nTabP0)
{
CalcPages();
+if (nTabP = static_castSCTAB(nPages.size()) )
+OSL_FAIL(nPages out ouf bounds, FIX IT);
UpdateDrawView(); // Tabelle evtl. geaendert
for (SCTAB i=0; inTabP; i++)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - RepositoryModule_ooo.mk solenv/bin solenv/gbuild ure/Makefile ure/Module_ure.mk ure/Package_distribution.mk ure/Package_uretest.mk ure/prj ure/Rdb_ure.mk ure/sourc
RepositoryModule_ooo.mk |1 solenv/bin/make |binary solenv/gbuild/Rdb.mk | 86 ++ solenv/gbuild/RdbTarget.mk | 97 --- solenv/gbuild/TargetLocations.mk |6 +- solenv/gbuild/gbuild.mk |2 ure/Makefile | 40 ure/Module_ure.mk| 37 ++ ure/Package_distribution.mk | 38 +++ ure/Package_uretest.mk | 32 ure/Rdb_ure.mk | 56 ++ ure/Zip_uretest.mk | 54 + ure/prj/build.lst|2 ure/prj/d.lst| 11 ure/prj/makefile.mk |1 ure/source/makefile.mk | 75 -- 16 files changed, 350 insertions(+), 188 deletions(-) New commits: commit 764f2b2790e02f80ec67e85f23472dd4db6fc977 Author: David Tardon dtar...@redhat.com Date: Mon Dec 26 12:31:21 2011 +0100 gbuildize ure diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 281b198..1e4ff6e 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -101,6 +101,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ UnoControls \ unotools \ unoxml \ +ure \ uui \ vbahelper \ vcl \ diff --git a/ure/Makefile b/ure/Makefile new file mode 100644 index 000..7bbbe6c --- /dev/null +++ b/ure/Makefile @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# http://www.openoffice.org/license.html +# for a copy of the LGPLv3 License. +# +#* + +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk +else + +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) + +endif +# vim: set noet sw=4 ts=4: diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk new file mode 100644 index 000..0f75d4c --- /dev/null +++ b/ure/Module_ure.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,ure)) + +$(eval $(call gb_Module_add_targets,ure,\ +Package_distribution \ +Package_uretest \ +Rdb_ure \ +Zip_uretest \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/ure/Package_distribution.mk b/ure/Package_distribution.mk new file mode 100644 index 000..81a39cf --- /dev/null +++ b/ure/Package_distribution.mk @@ -0,0 +1,38 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of
[Libreoffice-commits] .: solenv/bin
dev/null |binary 1 file changed New commits: commit ecbda593ef71de8eb27b19ad8e421f87f7b2adf5 Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Dec 26 12:51:40 2011 -0600 remove apparentely accidental addition of a linux binary module for make diff --git a/solenv/bin/make b/solenv/bin/make deleted file mode 100755 index 18a5855..000 Binary files a/solenv/bin/make and /dev/null differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source
dbaccess/source/ui/dlg/indexdialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 18296b08b1c05837b1f06f5773d95246cfd7cb68
Author: Andras Timar ati...@suse.com
Date: Mon Dec 26 22:34:08 2011 +0100
missing icons in Index Design dialog fdo#38435
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index b11ce3a..43270ac 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -882,7 +882,7 @@ DBG_NAME(DbaIndexDialog)
{
nN = IMG_INDEX_DLG_LC;
}
-return ImageList( nN );
+return ImageList(ModuleRes(nN));
}
//--
void DbaIndexDialog::resizeControls(const Size _rDiff)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/dlg/indexdialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 43100964840d0a18dad8b655de2ce94ce5fa42eb
Author: Andras Timar ati...@suse.com
Date: Mon Dec 26 22:34:08 2011 +0100
missing icons in Index Design dialog fdo#38435
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index 6293772..10d5c42 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -882,7 +882,7 @@ DBG_NAME(DbaIndexDialog)
{
nN = IMG_INDEX_DLG_LC;
}
-return ImageList( nN );
+return ImageList(ModuleRes(nN));
}
//--
void DbaIndexDialog::resizeControls(const Size _rDiff)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/index/idxmrk.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d3912cccfa4ae18c8d8b14b0bdc9f78b6ed87c54
Author: Lior Kaplan kaplanl...@gmail.com
Date: Tue Dec 27 00:08:29 2011 +0200
Remove an unnecessary full stop
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 31c2ee7..af743fa 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -251,7 +251,7 @@ Text [ en-US ] = Phonetic reading;\
Pos = MAP_APPFONT ( IDX_COL1 , 90 ) ;
\
Size = MAP_APPFONT ( 140 , 12 ) ;
\
Hide = TRUE;
\
-Text [ en-US ] = ~Apply to all similar texts.;\
+Text [ en-US ] = ~Apply to all similar texts;\
};
\
CheckBox CB_CASESENSITIVE
\
{
\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/index/idxmrk.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53a0078e8b653de8d5519d2094ccf03b4f57ec2f
Author: Lior Kaplan kaplanl...@gmail.com
Date: Tue Dec 27 00:08:29 2011 +0200
Remove an unnecessary full stop
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 31c2ee7..af743fa 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -251,7 +251,7 @@ Text [ en-US ] = Phonetic reading;\
Pos = MAP_APPFONT ( IDX_COL1 , 90 ) ;
\
Size = MAP_APPFONT ( 140 , 12 ) ;
\
Hide = TRUE;
\
-Text [ en-US ] = ~Apply to all similar texts.;\
+Text [ en-US ] = ~Apply to all similar texts;\
};
\
CheckBox CB_CASESENSITIVE
\
{
\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |9 ++---
writerfilter/source/rtftok/rtfdocumentimpl.cxx|3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit e71d6df4137515f928d87375e404459cf9f310be
Author: Miklos Vajna vmik...@frugalware.org
Date: Tue Dec 27 00:00:33 2011 +0100
Related: fdo#43380 fix parsing of the \cf RTF token
Send the real color value to dmapper, not the index, which is
meaningless outside the tokenizer.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4c9f8a3..de1195b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2057,7 +2057,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
case RTF_CF:
{
// NS_sprm::LN_CIco won't work, that would be an index in a
static table
-
m_aStates.top().aCharacterAttributes-push_back(make_pair(NS_ooxml::LN_CT_Color_val,
pIntValue));
+RTFValue::Pointer_t pValue(new
RTFValue(getColorTable(nParam)));
+
m_aStates.top().aCharacterAttributes-push_back(make_pair(NS_ooxml::LN_CT_Color_val,
pValue));
}
break;
case RTF_S:
commit e4e77861c6a42d040230f4b1ca22ad5e8c3d52a2
Author: Miklos Vajna vmik...@frugalware.org
Date: Tue Dec 27 00:00:18 2011 +0100
fdo#43380: fix crash in DomainMapper_Impl::SetFieldFFData
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index abb97e6..8352cdd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3097,10 +3097,13 @@ void
DomainMapper_Impl::SetFieldFFData(FFDataHandler::Pointer_t pFFDataHandler)
dmapper_logger-startElement(setFieldFFData);
#endif
-FieldContextPtr pContext = m_aFieldStack.top();
-if (pContext.get())
+if (m_aFieldStack.size())
{
-pContext-setFFDataHandler(pFFDataHandler);
+FieldContextPtr pContext = m_aFieldStack.top();
+if (pContext.get())
+{
+pContext-setFFDataHandler(pFFDataHandler);
+}
}
#ifdef DEBUG_DOMAINMAPPER
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |9 ++---
writerfilter/source/rtftok/rtfdocumentimpl.cxx|3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit b005f91d1da11c0a781c5752b69a464fe4640da0
Author: Miklos Vajna vmik...@frugalware.org
Date: Tue Dec 27 00:00:33 2011 +0100
Related: fdo#43380 fix parsing of the \cf RTF token
Send the real color value to dmapper, not the index, which is
meaningless outside the tokenizer.
(cherry picked from commit e71d6df4137515f928d87375e404459cf9f310be)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aef9966..3a3469e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2064,7 +2064,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
case RTF_CF:
{
// NS_sprm::LN_CIco won't work, that would be an index in a
static table
-
m_aStates.top().aCharacterAttributes-push_back(make_pair(NS_ooxml::LN_CT_Color_val,
pIntValue));
+RTFValue::Pointer_t pValue(new
RTFValue(getColorTable(nParam)));
+
m_aStates.top().aCharacterAttributes-push_back(make_pair(NS_ooxml::LN_CT_Color_val,
pValue));
}
break;
case RTF_S:
commit 8a20cc2b399ae0aaf89d97a9a3265f86d47bde06
Author: Miklos Vajna vmik...@frugalware.org
Date: Tue Dec 27 00:00:18 2011 +0100
fdo#43380: fix crash in DomainMapper_Impl::SetFieldFFData
(cherry picked from commit e4e77861c6a42d040230f4b1ca22ad5e8c3d52a2)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 4bd3f18..d36fda0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3095,10 +3095,13 @@ void
DomainMapper_Impl::SetFieldFFData(FFDataHandler::Pointer_t pFFDataHandler)
dmapper_logger-startElement(setFieldFFData);
#endif
-FieldContextPtr pContext = m_aFieldStack.top();
-if (pContext.get())
+if (m_aFieldStack.size())
{
-pContext-setFFDataHandler(pFFDataHandler);
+FieldContextPtr pContext = m_aFieldStack.top();
+if (pContext.get())
+{
+pContext-setFFDataHandler(pFFDataHandler);
+}
}
#ifdef DEBUG_DOMAINMAPPER
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 472a7db1ef118147d949b13c66bb86411dbc7a75 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Dec 27 00:16:36 2011 +0100 register hunspell as static library diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6b9ebc0..ac2a95b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -192,6 +192,10 @@ endef else # !SYSTEM_HUNSPELL +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \ +)) + define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_add_defs,$(1),\ -DHUNSPELL_STATIC \ @@ -200,8 +204,8 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(OUTDIR)/inc/hunspell \ ) -$(call gb_LinkTarget_add_libs,$(1),\ - $(if $(filter WNT,$(OS)),libhunspell.lib,-lhunspell-1.3) \ +$(call gb_LinkTarget_add_linked_static_libs,$(1),\ + $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \ ) endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - sc/source vcl/unx
sc/source/ui/app/inputhdl.cxx |2 +-
sc/source/ui/view/preview.cxx |4 ++--
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 911c2b2a0ed20576ff47c6232e498a8e7ab129a4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 26 14:56:25 2011 +0100
fix assertion error in GtkFolderPicker during recovery dialog
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index e8e4578..ec1b0c8 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -89,7 +89,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const
rtl::OUString aDir
OString aTxt = unicodetouri( aDirectory );
-if( aTxt.lastIndexOf('/') == aTxt.getLength() - 1 )
+if( aTxt.lastIndexOf('/') == aTxt.getLength() - 1 !aTxt.isEmpty() )
aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
OSL_TRACE( setting path to %s, aTxt.getStr() );
commit d25ca30dd2005e162e5eadf94a49215931a37530
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 26 14:55:45 2011 +0100
missing pointer check in new multiline input code, fdo#43856
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 7620df7..c0e3cc6 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3413,7 +3413,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState*
pState,
if (pData)
{
pEngine-SetText( *pData );
-if ( pInputWin-IsMultiLineInput() )
+if ( pInputWin pInputWin-IsMultiLineInput() )
aString =
ScEditUtil::GetMultilineString(*pEngine);
else
aString = GetEditText(pEngine);
commit d1c1c679db1f2a58803af0502d2b9aa6762e92f1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 26 14:54:31 2011 +0100
move OSL_FAIL to correct location
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 1c0d37a..4d72ef9 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -732,8 +732,6 @@ void ScPreview::SetPageNo( long nPage )
long ScPreview::GetFirstPage(SCTAB nTabP)
{
-if (nTabP = static_castSCTAB(nPages.size()) )
-OSL_FAIL(nPages out ouf bounds, FIX IT);
SCTAB nDocTabCount = pDocShell-GetDocument()-GetTableCount();
if (nTabP = nDocTabCount)
nTabP = nDocTabCount-1;
@@ -742,6 +740,8 @@ long ScPreview::GetFirstPage(SCTAB nTabP)
if (nTabP0)
{
CalcPages();
+if (nTabP = static_castSCTAB(nPages.size()) )
+OSL_FAIL(nPages out ouf bounds, FIX IT);
UpdateDrawView(); // Tabelle evtl. geaendert
for (SCTAB i=0; inTabP; i++)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) New commits: commit 570120e98075c6dc5b452fa68ba9699ae48ae2e1 Author: Lior Kaplan kaplanl...@gmail.com Date: Tue Dec 27 02:57:27 2011 +0200 Use default UI_SANS (dropping Culmus fonts), but keep Tahoma first (for Windows) Don't override SANS_UNICODE Drop nachlieli and lucidagrande (no such fonts) Beautify remaining fonts' names (cherry picked from commit 1d55be916472270d23f7d3ff7513dd6df6dc1e46) diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 90ef510..9a14e02 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -477,25 +477,22 @@ /node node oor:name=he oor:op=replace prop oor:name=UI_SANS oor:op=replace oor:type=xs:string -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;supplement;Andale Sans UI;arialunicodems;lucidasansunicode;interfaceuser;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif/value +valueTahoma;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Lucida;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif/value /prop - prop oor:name=SANS_UNICODE oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;lucidasans;arialunicodems;lucidasansunicode;nachlieli;lucidagrande;clearlyu;lucida;sansserif/value - /prop prop oor:name=CTL_DISPLAY oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;nachlieli;lucidagrande;lucidasans;arialunicodems/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop prop oor:name=CTL_HEADING oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;nachlieli;lucidagrande;lucidasans;arialunicodems/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop prop oor:name=CTL_PRESENTATION oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;nachlieli;lucidagrande;lucidasans;arialunicodems/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop prop oor:name=CTL_SPREADSHEET oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;nachlieli;lucidagrande;lucidasans;arialunicodems/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop prop oor:name=CTL_TEXT oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;nachlieli;lucidagrande;lucidasans;arialunicodems/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop /node node oor:name=th oor:op=replace ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: stoc/source stoc/test
stoc/source/implementationregistration/implreg.cxx |6 +++---
stoc/source/invocation/invocation.cxx |2 +-
stoc/source/javaloader/javaloader.cxx |2 +-
stoc/source/javavm/javavm.cxx |8
stoc/source/loader/dllcomponentloader.cxx |2 +-
stoc/source/registry_tdprovider/functiondescription.cxx |2 +-
stoc/source/registry_tdprovider/methoddescription.cxx |2 +-
stoc/source/registry_tdprovider/tdiface.cxx |4 ++--
stoc/source/security/access_controller.cxx |2 +-
stoc/source/servicemanager/servicemanager.cxx |6 +++---
stoc/source/simpleregistry/textualservices.cxx |2 +-
stoc/source/tdmanager/tdmgr.cxx |8
stoc/source/uriproc/UriReferenceFactory.cxx |2 +-
stoc/test/excomp/excomp.cxx |2 +-
stoc/test/javavm/jvm_interaction/interactionhandler.cxx | 10 +-
stoc/test/javavm/testjavavm.cxx |2 +-
stoc/test/security/test_security.cxx|4 ++--
stoc/test/testconv.cxx |6 +++---
stoc/test/testcorefl.cxx|2 +-
stoc/test/testiadapter.cxx |8
stoc/test/testintrosp.cxx |8
stoc/test/testproxyfac.cxx |4 ++--
stoc/test/testregistry.cxx |2 +-
stoc/test/testsmgr2.cxx |2 +-
stoc/test/testsmgr_cpnt.cxx |2 +-
25 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit c936e5062770ba100c2eddd7889b51d271c6c73c
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Dec 27 00:12:38 2011 +0900
catch exception by constant reference
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/implementationregistration/implreg.cxx
index 69435a7..9fb148c 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1025,7 +1025,7 @@ static void insert_singletons(
buf.makeStringAndClear(), Reference
XInterface () );
}
}
-catch (container::NoSuchElementException exc)
+catch (const container::NoSuchElementException exc)
{
throw RuntimeException(
OUSTR(cannot get service type description: )
+ exc.Message,
@@ -1564,7 +1564,7 @@ void ImplementationRegistration::prepareRegister(
{
throw;
}
-catch( InvalidRegistryException e )
+catch( const InvalidRegistryException e )
{
OUStringBuffer buf;
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
@@ -1575,7 +1575,7 @@ void ImplementationRegistration::prepareRegister(
throw CannotRegisterImplementationException(
buf.makeStringAndClear(), Reference XInterface () );
}
-catch( MergeConflictException e )
+catch( const MergeConflictException e )
{
OUStringBuffer buf;
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
diff --git a/stoc/source/invocation/invocation.cxx
b/stoc/source/invocation/invocation.cxx
index 33496c6..fa034e6 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -614,7 +614,7 @@ void Invocation_Impl::setValue( const OUString
PropertyName, const Any Value )
{
throw;
}
-catch (Exception exc)
+catch (const Exception exc)
{
throw InvocationTargetException(
OUString( RTL_CONSTASCII_USTRINGPARAM(exception occurred in
setValue(): ) ) +
diff --git a/stoc/source/javaloader/javaloader.cxx
b/stoc/source/javaloader/javaloader.cxx
index b30df67..62e4a1c 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -417,7 +417,7 @@ css::uno::ReferenceXInterface SAL_CALL
JavaComponentLoader_CreateInstance(cons
pStaticRef = new css::uno::Reference XInterface ( xRet );
}
}
-catch(RuntimeException runtimeException) {
+catch(const RuntimeException runtimeException) {
OString message = OUStringToOString(runtimeException.Message,
RTL_TEXTENCODING_ASCII_US);
osl_trace(javaloader - could not init javaloader cause of %s,
message.getStr());
throw;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 33d8280..502031d 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -549,7 +549,7 @@ void initVMConfiguration(
try {
