[Libreoffice-commits] .: 3 commits - scp2/source sc/source svx/source sw/source vbahelper/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Aug 26 07:33:01 PDT 2011
sc/source/ui/vba/vbahelper.cxx | 4 +++-
scp2/source/ooo/file_library_ooo.scp | 4 +++-
scp2/source/ooo/makefile.mk | 4 ++++
svx/source/form/fmsrcimp.cxx | 29 +++++++++++++++++------------
sw/source/core/access/accpara.cxx | 2 +-
vbahelper/source/vbahelper/vbahelper.cxx | 14 +++++++-------
6 files changed, 35 insertions(+), 22 deletions(-)
New commits:
commit 71fcd819d59218f020faaa0b7f17b9235a609e49
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 26 15:32:07 2011 +0100
catch by const ref
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index adc7b24..2dedc41 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -156,7 +156,9 @@ public:
{
setReplaceCellsWarning( true );
}
- catch ( uno::Exception& /*e*/ ){}
+ catch (const uno::Exception&)
+ {
+ }
}
}
};
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index e8ec678..8496b06 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2141,7 +2141,7 @@ sal_Bool SwAccessibleParagraph::setAttributes(
{
xPortion->setPropertyValues( aNames, aValues );
}
- catch( UnknownPropertyException &e )
+ catch (const UnknownPropertyException&)
{
// error handling through return code!
bRet = sal_False;
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index a52ef14..ebce6ff 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -187,7 +187,7 @@ dispatchRequests (const uno::Reference< frame::XModel>& xModel, const rtl::OUStr
return;
xParser->parseStrict (url);
}
- catch ( uno::Exception & /*e*/ )
+ catch (const uno::Exception&)
{
return;
}
@@ -319,7 +319,7 @@ getCurrentExcelDoc( const uno::Reference< uno::XComponentContext >& xContext ) t
{
xModel = getCurrentDoc( sThisExcelDoc );
}
- catch( uno::Exception& e )
+ catch (const uno::Exception&)
{
xModel = getThisExcelDoc( xContext );
}
@@ -335,7 +335,7 @@ getCurrentWordDoc( const uno::Reference< uno::XComponentContext >& xContext ) th
{
xModel = getCurrentDoc( sThisWordDoc );
}
- catch( uno::Exception& e )
+ catch (const uno::Exception&)
{
xModel = getThisWordDoc( xContext );
}
@@ -759,7 +759,7 @@ sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel )
if ( pWindow )
nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle();
}
- catch( const uno::Exception& )
+ catch (const uno::Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1109,7 +1109,7 @@ double ShapeHelper::getHeight() const
aSize.Height = Millimeter::getInHundredthsOfOneMillimeter(_fheight);
xShape->setSize(aSize);
}
- catch ( css::uno::Exception& /*e*/)
+ catch (const css::uno::Exception&)
{
throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
@@ -1127,7 +1127,7 @@ void ShapeHelper::setWidth(double _fWidth) throw ( css::script::BasicErrorExcept
aSize.Width = Millimeter::getInHundredthsOfOneMillimeter(_fWidth);
xShape->setSize(aSize);
}
- catch (css::uno::Exception& /*e*/)
+ catch (const css::uno::Exception&)
{
throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
@@ -1248,7 +1248,7 @@ uno::Reference< XHelperInterface > getVBADocument( const uno::Reference< frame::
xDocProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CodeName" ) ) ) >>= aCodeName;
xIf = getUnoDocModule( aCodeName, getSfxObjShell( xModel ) );
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
return xIf;
commit 771def6aec5bbb1966f65e81cdf68afd94aa4b70
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 26 15:31:52 2011 +0100
mirror postprocess logic in here
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b210026..b1ef33b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1488,9 +1488,10 @@ File gid_File_Lib_XSec_Framework
Styles = (PACKED);
End
+#if defined(ENABLE_NSS_MODULE) || defined(SYSTEM_MOZILLA)
File gid_File_Lib_XSec_XmlSec
TXT_FILE_BODY;
- #ifdef UNX
+ #ifdef UNX
Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
#else
Name = "xsec_xmlsec.dll";
@@ -1498,6 +1499,7 @@ File gid_File_Lib_XSec_XmlSec
Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
+#endif
File gid_File_Lib_XSec_XMLSecurity
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 7d6aba5..a3fcd6a 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -96,6 +96,10 @@ SCPDEFS+=-DENABLE_EVOAB2
SCPDEFS+=-DENABLE_DIRECTX
.ENDIF
+.IF "$(ENABLE_NSS_MODULE)"=="YES"
+SCPDEFS+=-DENABLE_NSS_MODULE
+.ENDIF
+
.IF "$(GUI)"=="UNX"
#X11 MacOSX has no cairo-canvas
.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
commit d82431543fe03a7e817fe329aca0ec11c7669c48
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 26 14:28:41 2011 +0100
WaE: and migrate to rtl::OStringBuffer
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 5b5ad1a..9fe1c7e 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -29,6 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
+#include <rtl/strbuf.hxx>
#include "svx/fmresids.hrc"
#include "svx/fmtools.hxx"
#include "svx/fmsrccfg.hxx"
@@ -250,22 +251,26 @@ sal_Bool FmSearchEngine::MoveCursor()
catch(::com::sun::star::sdbc::SQLException const& e)
{
#if OSL_DEBUG_LEVEL > 0
- String sDebugMessage;
- sDebugMessage.AssignAscii("FmSearchEngine::MoveCursor : catched a DatabaseException (");
- sDebugMessage += (const sal_Unicode*)e.SQLState;
- sDebugMessage.AppendAscii(") !");
- OSL_FAIL(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer());
+ rtl::OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM(
+ "FmSearchEngine::MoveCursor : catched a DatabaseException ("));
+ sDebugMessage.append(rtl::OUStringToOString(e.SQLState, RTL_TEXTENCODING_ASCII_US));
+ sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !"));
+ OSL_FAIL(sDebugMessage.getStr());
+#else
+ (void)e;
#endif
bSuccess = sal_False;
}
catch(Exception const& e)
{
#if OSL_DEBUG_LEVEL > 0
- UniString sDebugMessage;
- sDebugMessage.AssignAscii("FmSearchEngine::MoveCursor : catched an Exception (");
- sDebugMessage += (const sal_Unicode*)e.Message;
- sDebugMessage.AppendAscii(") !");
- OSL_FAIL(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer());
+ rtl::OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM(
+ "FmSearchEngine::MoveCursor : catched an Exception ("));
+ sDebugMessage.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US));
+ sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !"));
+ OSL_FAIL(sDebugMessage.getStr());
+#else
+ (void)e;
#endif
bSuccess = sal_False;
}
@@ -858,7 +863,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
{
xCursorProps->getPropertyValue( FM_PROP_ACTIVE_CONNECTION ) >>= xConn;
}
- catch( Exception& ) { /* silent this - will be asserted below */ }
+ catch( const Exception& ) { /* silent this - will be asserted below */ }
}
if ( xConn.is() )
xMeta = xConn->getMetaData();
@@ -905,7 +910,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
m_arrFieldMapping.push_back(nFoundIndex);
}
}
- catch(Exception&)
+ catch (const Exception&)
{
OSL_FAIL("Exception occurred!");
}
More information about the Libreoffice-commits
mailing list