[Libreoffice-commits] .: 2 commits - filter/source sd/CppunitTest_sd_filters_test.mk sd/Module_sd.mk
filter/source/svg/svgexport.cxx | 38 +++---
filter/source/svg/svgreader.cxx |6 +++---
filter/source/svg/svgwriter.hxx |6 --
sd/CppunitTest_sd_filters_test.mk |2 +-
sd/Module_sd.mk | 13 +
5 files changed, 12 insertions(+), 53 deletions(-)
New commits:
commit efc28fae8d9453ff313f363d28e5a94ccd3adc4a
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Jan 24 23:19:22 2012 +0100
Disable svg font embedding for sd filters test, enable again.
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 1d63611..24aa950 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -27,8 +27,6 @@
/
-#define ITEMID_FIELD 0
-
#include svgwriter.hxx
#include svgfontexport.hxx
#include svgfilter.hxx
@@ -37,6 +35,7 @@
#include com/sun/star/util/MeasureUnit.hpp
+#include rtl/bootstrap.hxx
#include svtools/miscopt.hxx
#include svx/unopage.hxx
#include svx/unoshape.hxx
@@ -488,9 +487,14 @@ sal_Bool SVGFilter::implExport( const Sequence
PropertyValue rDescriptor )
// font embedding
const char* pSVGDisableFontEmbedding = getenv(
SVG_DISABLE_FONT_EMBEDDING );
+rtl::OUString aEmbedFontEnv(
+RTL_CONSTASCII_USTRINGPARAM(${SVG_DISABLE_FONT_EMBEDDING}));
+rtl::Bootstrap::expandMacros(aEmbedFontEnv);
+const bool bEmbedFonts=pSVGDisableFontEmbedding ? false : (
+aEmbedFontEnv.getLength() ? false : true);
maFilterData[ 1 ].Name = B2UCONST( SVG_PROP_EMBEDFONTS );
-maFilterData[ 1 ].Value = (sal_Bool) ( pSVGDisableFontEmbedding ?
sal_False : sal_True );
+maFilterData[ 1 ].Value = (sal_Bool) (bEmbedFonts);
// Native decoration
maFilterData[ 2 ].Name = B2UCONST( SVG_PROP_NATIVEDECORATION );
diff --git a/sd/CppunitTest_sd_filters_test.mk
b/sd/CppunitTest_sd_filters_test.mk
index b4de440..5b89b8f 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -123,7 +123,7 @@ $(eval $(call
gb_CppunitTest_add_old_components,sd_filters_test,\
$(eval $(call gb_CppunitTest_set_args,sd_filters_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT)
unoexceptionprotector \
--env:CONFIGURATION_LAYERS=xcsxcu:$(call
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) \
+-env:CONFIGURATION_LAYERS=xcsxcu:$(call
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)
-env:SVG_DISABLE_FONT_EMBEDDING=YEAH module:$(call
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) \
))
# .../spool is required for the (somewhat strange) filter configuration
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index f015d04..edc6f25 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -52,18 +52,7 @@ endif
$(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
JunitTest_sd_unoapi \
+CppunitTest_sd_regression_test \
))
-#TODO: Disabled for now, needs work by Thorsten Behrens to get don't embed
font
-# config taken into account, otherwise leads to failures like
-# regression-test.cxx:84:Assertion
-# Test name: SdFiltersTest::test
-# assertion failed
-# - Expression: false
-# - Mismatch between reference file and exported file in line 60.
-# Expected: font-face font-family=StarSymbol embedded units-per-em=2048
-# font-weight=normal font-style=normal ascent=1693 descent=318/
-# Found : font-face font-family=StarSymbol embedded units-per-em=2048
-# font-weight=normal font-style=normal ascent=1640 descent=397/
-# CppunitTest_sd_regression_test \
# vim: set noet sw=4 ts=4:
commit e5e0aae1e220cdde7b06c899425dcabd912048d1
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Jan 24 22:23:19 2012 +0100
Remove dead code from svg filter
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 905bd62..1d63611 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -38,7 +38,6 @@
#include com/sun/star/util/MeasureUnit.hpp
#include svtools/miscopt.hxx
-#include svtools/FilterConfigItem.hxx
#include svx/unopage.hxx
#include svx/unoshape.hxx
#include svx/svdpage.hxx
@@ -482,18 +481,6 @@ sal_Bool SVGFilter::implExport( const Sequence
PropertyValue rDescriptor )
// if no filter data is given use stored/prepared ones
if( !maFilterData.getLength() )
{
-#ifdef _SVG_USE_CONFIG
-FilterConfigItem aCfgItem( String( RTL_CONSTASCII_USTRINGPARAM(
SVG_EXPORTFILTER_CONFIGPATH ) ) );
-
-aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM(
SVG_PROP_TINYPROFILE ) ), sal_True );
-aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM(
SVG_PROP_EMBEDFONTS ) ), sal_True );
-aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM(
[Libreoffice-commits] .: 2 commits - filter/source tools/inc tools/source unusedcode.easy writerperfect/source
filter/source/svg/svgexport.cxx | 55 ---
filter/source/svg/svgfilter.hxx |8
filter/source/svg/svgwriter.cxx |8
tools/inc/tools/color.hxx|1
tools/source/generic/color.cxx | 15
unusedcode.easy |7 ---
writerperfect/source/filter/PageSpan.cxx | 16 -
writerperfect/source/filter/PageSpan.hxx |2 -
8 files changed, 112 deletions(-)
New commits:
commit 3e04e08d371532960917afbcd59307fbd6c1f313
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Wed Jan 18 19:59:13 2012 -0500
This method is now unused.
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ea63fa1..905bd62 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -392,13 +392,6 @@ sal_Bool SVGExport::IsUseOpacity() const
return bRet;
}
-//
-
-
-const ::basegfx::B2DPolyPolygon* SVGExport::getCurClip() const
-{
-return NULL;
-}
-
//
// - ObjectRepresentation -
//
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index d218e06..68c19d4 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -143,8 +143,6 @@ public:
sal_Bool IsUseNativeTextDecoration() const;
sal_Bool IsUseOpacity() const;
-const ::basegfx::B2DPolyPolygon* getCurClip() const;
-
protected:
virtual void_ExportStyles( sal_Bool /* bUsed */ ) {}
commit 05a8ecca55d96b823348fa390482be6cfee64f69
Author: Marc-André Laverdière-Papineau marc-an...@atc.tcs.com
Date: Sun Jan 15 18:24:58 2012 -0500
removed some dead code
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 6149ddf..ea63fa1 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -382,20 +382,6 @@ sal_Bool SVGExport::IsUseNativeTextDecoration() const
//
-
-::rtl::OUString SVGExport::GetGlyphPlacement() const
-{
-::rtl::OUString aRet;
-
-if( mrFilterData.getLength() 3 )
-mrFilterData[ 3 ].Value = aRet;
-else
-aRet = B2UCONST( abs );
-
-return aRet;
-}
-
-//
-
-
sal_Bool SVGExport::IsUseOpacity() const
{
sal_Bool bRet = !IsUseTinyProfile();
@@ -408,43 +394,9 @@ sal_Bool SVGExport::IsUseOpacity() const
//
-
-sal_Bool SVGExport::IsUseGradient() const
-{
-sal_Bool bRet = !IsUseTinyProfile();
-
-if( !bRet ( mrFilterData.getLength() 5 ) )
-mrFilterData[ 5 ].Value = bRet;
-
-return bRet;
-}
-
-//
-
-
-void SVGExport::pushClip( const ::basegfx::B2DPolyPolygon rPolyPoly )
-{
-maClipList.push_front( ::basegfx::tools::correctOrientations( rPolyPoly )
);
-}
-
-//
-
-
-void SVGExport::popClip()
-{
-if( !maClipList.empty() )
-maClipList.pop_front();
-}
-
-//
-
-
-sal_Bool SVGExport::hasClip() const
-{
-return( !maClipList.empty() );
-}
-
-//
-
-
const ::basegfx::B2DPolyPolygon* SVGExport::getCurClip() const
{
-return( maClipList.empty() ? NULL : ( *maClipList.begin() ) );
+return NULL;
}
//
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 21c1238..d218e06 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -141,13 +141,8 @@ public:
sal_Bool IsUseTinyProfile() const;
sal_Bool IsEmbedFonts() const;
sal_Bool IsUseNativeTextDecoration() const;
-::rtl::OUString GetGlyphPlacement() const;
sal_Bool IsUseOpacity() const;
-sal_Bool IsUseGradient() const;
-void pushClip( const ::basegfx::B2DPolyPolygon rPolyPoly );
-void popClip();
-sal_Bool hasClip() const;
const ::basegfx::B2DPolyPolygon* getCurClip() const;
protected:
@@ -161,7 +156,6 @@ protected:
private:
const Sequence PropertyValue mrFilterData;
-B2DPolyPolygonList maClipList;
SVGExport();
};
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 9f70046..0639e5d 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -640,14 +640,6 @@ void SVGActionWriter::ImplWritePolyPolygon( const
PolyPolygon rPolyPoly, sal_Bo
else
aPolyPoly = rPolyPoly;
-if( mrExport.hasClip() )
-
[Libreoffice-commits] .: 2 commits - filter/source sc/source sw/inc sw/source
filter/source/pdf/pdfexport.cxx | 42 ++--
filter/source/pdf/pdfexport.hxx |8
sc/source/ui/unoobj/docuno.cxx | 26 +-
sw/inc/EnhancedPDFExportHelper.hxx |6
sw/source/core/text/EnhancedPDFExportHelper.cxx | 220 +---
5 files changed, 207 insertions(+), 95 deletions(-)
New commits:
commit 5ad4d151dac1eb887d92200330e31af269d8d1fd
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Oct 19 21:52:17 2011 +0400
migrate to StringRangeEnumerator in pdfexport
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 43d665d..9e1d4ef 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -168,8 +168,12 @@ PDFExport::~PDFExport()
//
-
-sal_Bool PDFExport::ExportSelection( vcl::PDFWriter rPDFWriter, Reference
com::sun::star::view::XRenderable rRenderable, Any rSelection,
-MultiSelection aMultiSelection, Sequence PropertyValue rRenderOptions,
sal_Int32 nPageCount )
+sal_Bool PDFExport::ExportSelection( vcl::PDFWriter rPDFWriter,
+Reference com::sun::star::view::XRenderable rRenderable,
+const Any rSelection,
+const StringRangeEnumerator rRangeEnum,
+Sequence PropertyValue rRenderOptions,
+sal_Int32 nPageCount )
{
sal_BoolbRet = sal_False;
try
@@ -192,11 +196,12 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter
rPDFWriter, Reference com:
vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST(
vcl::PDFExtOutDevData, pOut-GetExtOutDevData() );
if ( nPageCount )
{
-sal_Int32 nSel = aMultiSelection.FirstSelected();
sal_Int32 nCurrentPage(0);
-while ( nSel != sal_Int32(SFX_ENDOFSELECTION) )
+StringRangeEnumerator::Iterator aIter = rRangeEnum.begin();
+StringRangeEnumerator::Iterator aEnd = rRangeEnum.end();
+while ( aIter != aEnd )
{
-Sequence PropertyValueaRenderer(
rRenderable-getRenderer( nSel - 1, rSelection, rRenderOptions ) );
+Sequence PropertyValueaRenderer(
rRenderable-getRenderer( *aIter, rSelection, rRenderOptions ) );
awt::Size aPageSize;
for( sal_Int32 nProperty = 0, nPropertyCount =
aRenderer.getLength(); nProperty nPropertyCount; ++nProperty )
@@ -221,9 +226,9 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter
rPDFWriter, Reference com:
// #i35176#
// IsLastPage property.
-const sal_Int32 nCurrentRenderer = nSel - 1;
-nSel = aMultiSelection.NextSelected();
-if ( pLastPage sal_Int32(SFX_ENDOFSELECTION) == nSel )
+const sal_Int32 nCurrentRenderer = *aIter;
+++aIter;
+if ( pLastPage aIter == aEnd )
*pLastPage = sal_True;
rRenderable-render( nCurrentRenderer, rSelection,
rRenderOptions );
@@ -862,8 +867,6 @@ sal_Bool PDFExport::Export( const OUString rFile, const
Sequence PropertyValue
}
const sal_Int32 nPageCount = xRenderable-getRendererCount(
aSelection, aRenderOptions );
-const Range aRange( 1, nPageCount );
-MultiSelection aMultiSelection;
if ( mbExportNotesPages aCreator.EqualsAscii( Impress ) )
{
@@ -874,21 +877,20 @@ sal_Bool PDFExport::Export( const OUString rFile, const
Sequence PropertyValue
if( !aPageRange.getLength() )
{
-aMultiSelection.SetTotalRange( aRange );
-aMultiSelection.Select( aRange );
-}
-else
-{
-aMultiSelection = MultiSelection( aPageRange );
-aMultiSelection.SetTotalRange( aRange );
+aPageRange = OUStringBuffer()
+.append( static_cast sal_Int32 ( 1 ) )
+.append( static_cast sal_Unicode ( '-' ) )
+.append( nPageCount ).makeStringAndClear();
}
+StringRangeEnumerator aRangeEnum( aPageRange, 0, nPageCount-1
);
+
if ( mxStatusIndicator.is() )
{
ByteString aResMgrName( pdffilter );
ResMgr* pResMgr = ResMgr::CreateResMgr(
aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
if ( pResMgr )
{
-sal_Int32 nTotalPageCount =
aMultiSelection.GetSelectCount();
+sal_Int32 nTotalPageCount = aRangeEnum.size();
if (
[Libreoffice-commits] .: 2 commits - filter/source
filter/source/xsltdialog/typedetectionexport.cxx |1 + filter/source/xsltdialog/typedetectionimport.cxx |1 + filter/source/xsltdialog/xmlfiltercommon.hxx |1 + filter/source/xsltdialog/xmlfilterhelpids.hrc|1 + filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |9 +++-- filter/source/xsltdialog/xmlfiltertabpagexslt.cxx|7 +++ filter/source/xsltdialog/xmlfiltertabpagexslt.hrc|2 ++ filter/source/xsltdialog/xmlfiltertabpagexslt.hxx|3 +++ filter/source/xsltdialog/xmlfiltertabpagexslt.src| 18 ++ 9 files changed, 41 insertions(+), 2 deletions(-) New commits: commit 11fbde8fed1a866c4ec9565d56f5f5034631d8b2 Author: Peter Jentsch pj...@guineapics.de Date: Tue Oct 18 21:59:49 2011 +0200 support editing, importing, exporting the xslt transformer service setting starting with LO 3.4 we default to using libxslt for xslt transformations in filters. the saxon/j based services is still available and can be explicitly requested by filters using the 2nd userdata entry in the filter configuration. There wasn't any place to edit this 2nd userdata entry, and it wasn't exported or imported with the custom filter packages. diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index fb925b2..b607883 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -194,6 +194,7 @@ void TypeDetectionExporter::doExport( Reference XOutputStream xOS, const XML sValue += sComma; sValue += sXSLTFilterService; sValue += sDelim; +sValue += pFilter-maXSLTTransformerImpl; sValue += sDelim; const application_info_impl* pAppInfo = getApplicationInfo( pFilter-maExportService ); diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc index cced060..8e6a34f 100644 --- a/filter/source/xsltdialog/xmlfilterhelpids.hrc +++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc @@ -50,6 +50,7 @@ #define HID_XML_FILTER_DOCTYPE FILTER_HID_XML_FILTER_DOCTYPE #define HID_XML_FILTER_DTD FILTER_HID_XML_FILTER_DTD #define HID_XML_FILTER_DTD_BROWSE FILTER_HID_XML_FILTER_DTD_BROWSE +#define HID_XML_FILTER_TRANSFORM_SERVICE FILTER_HID_XML_FILTER_TRANSFORM_SERVICE #define HID_XML_FILTER_EXPORT_XSLT FILTER_HID_XML_FILTER_EXPORT_XSLT #define HID_XML_FILTER_EXPORT_XSLT_BROWSE FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE #define HID_XML_FILTER_IMPORT_XSLT FILTER_HID_XML_FILTER_IMPORT_XSLT diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index c5ebd3b..abb3051 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -68,6 +68,9 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr rResMgr, co maEDImportTemplate( this, ResId( ED_XML_IMPORT_TEMPLATE, rResMgr ), INET_PROT_FILE ), maPBImportTemplate( this, ResId( PB_XML_IMPORT_TEMPLATE_BROWSE, rResMgr ) ), +maFTTransformationService( this, ResId (FT_XML_TRANSFORM_SERVICE, rResMgr ) ), +maEDTransformationService( this, ResId (ED_XML_TRANSFORM_SERVICE, rResMgr ) ), + sHTTPSchema( RTL_CONSTASCII_USTRINGPARAM( http://; ) ), sSHTTPSchema( RTL_CONSTASCII_USTRINGPARAM( shttp://; ) ), sFILESchema( RTL_CONSTASCII_USTRINGPARAM( file:// ) ), @@ -96,6 +99,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr rResMgr, co maEDExportXSLT.SetHelpId( HID_XML_FILTER_EXPORT_XSLT ); maEDImportXSLT.SetHelpId( HID_XML_FILTER_IMPORT_XSLT ); maEDImportTemplate.SetHelpId( HID_XML_FILTER_IMPORT_TEMPLATE ); +maEDTransformationService.SetHelpId( HID_XML_FILTER_TRANSFORM_SERVICE ); } XMLFilterTabPageXSLT::~XMLFilterTabPageXSLT() @@ -111,6 +115,7 @@ bool XMLFilterTabPageXSLT::FillInfo( filter_info_impl* pInfo ) pInfo-maExportXSLT = GetURL( maEDExportXSLT ); pInfo-maImportXSLT = GetURL( maEDImportXSLT ); pInfo-maImportTemplate = GetURL( maEDImportTemplate ); +pInfo-maXSLTTransformerImpl = maEDTransformationService.GetText(); } return true; @@ -126,6 +131,8 @@ void XMLFilterTabPageXSLT::SetInfo(const filter_info_impl* pInfo) SetURL( maEDExportXSLT, pInfo-maExportXSLT ); SetURL( maEDImportXSLT, pInfo-maImportXSLT ); SetURL( maEDImportTemplate, pInfo-maImportTemplate ); + +maEDTransformationService.SetText( pInfo-maXSLTTransformerImpl ); } } diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hrc b/filter/source/xsltdialog/xmlfiltertabpagexslt.hrc
[Libreoffice-commits] .: 2 commits - filter/source framework/source
filter/source/msfilter/msocximex.cxx|1
framework/source/uielement/uicommanddescription.cxx | 28 ++--
2 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 1da878532e2c821313609fe376df05895f1325a6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 26 12:53:38 2011 +0100
doesn't use a DocShell anymore, so can ditch check for it
diff --git a/filter/source/msfilter/msocximex.cxx
b/filter/source/msfilter/msocximex.cxx
index 19e217e..616df10 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -47,7 +47,6 @@ static char sWW8_form[] = WW-Standard;
SvxMSConvertOCXControls::SvxMSConvertOCXControls( const uno::Reference
frame::XModel rxModel) : mxModel(rxModel)
{
-OSL_ENSURE( pDocSh, No DocShell, Cannot do Controls );
}
SvxMSConvertOCXControls::~SvxMSConvertOCXControls()
commit 9cbc1eb35e2fff63f16a30e2fcc8909c2e566cc2
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 26 12:06:22 2011 +0100
WaE: unused e
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index a338c26..6702612 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -394,10 +394,10 @@ void ConfigurationAccess_UICommand::impl_fill(const
Reference XNameAccess _x
aImageMirrorVector.push_back( aNameSeq[i] );
}
}
-catch ( com::sun::star::lang::WrappedTargetException )
+catch (const com::sun::star::lang::WrappedTargetException)
{
}
-catch ( com::sun::star::container::NoSuchElementException )
+catch (const com::sun::star::container::NoSuchElementException)
{
}
}
@@ -437,11 +437,11 @@ sal_Bool
ConfigurationAccess_UICommand::addGenericInfoToCache()
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST ))) = aCommandNameSeq )
m_aCommandRotateImageList = comphelper::concatSequences
rtl::OUString ( m_aCommandRotateImageList, aCommandNameSeq );
}
-catch ( RuntimeException e )
+catch (const RuntimeException)
{
throw;
}
-catch ( Exception )
+catch (const Exception)
{
}
@@ -451,11 +451,11 @@ sal_Bool
ConfigurationAccess_UICommand::addGenericInfoToCache()
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ))) = aCommandNameSeq )
m_aCommandMirrorImageList = comphelper::concatSequences
rtl::OUString ( m_aCommandMirrorImageList, aCommandNameSeq );
}
-catch ( RuntimeException e )
+catch (const RuntimeException)
{
throw;
}
-catch ( Exception )
+catch (const Exception)
{
}
@@ -482,19 +482,19 @@ Any ConfigurationAccess_UICommand::getInfoFromCommand(
const rtl::OUString rCom
{
return m_xGenericUICommands-getByName( rCommandURL );
}
-catch ( com::sun::star::lang::WrappedTargetException )
+catch (const com::sun::star::lang::WrappedTargetException)
{
}
-catch ( com::sun::star::container::NoSuchElementException )
+catch (const
com::sun::star::container::NoSuchElementException)
{
}
}
}
}
-catch( com::sun::star::container::NoSuchElementException )
+catch (const com::sun::star::container::NoSuchElementException)
{
}
-catch ( com::sun::star::lang::WrappedTargetException )
+catch (const com::sun::star::lang::WrappedTargetException)
{
}
@@ -537,10 +537,10 @@ Sequence rtl::OUString
ConfigurationAccess_UICommand::getAllCommands()
return aNameSeq;
}
-catch( com::sun::star::container::NoSuchElementException )
+catch (const com::sun::star::container::NoSuchElementException)
{
}
-catch ( com::sun::star::lang::WrappedTargetException )
+catch (const com::sun::star::lang::WrappedTargetException)
{
}
}
@@ -587,10 +587,10 @@ sal_Bool
ConfigurationAccess_UICommand::initializeConfigAccess()
return sal_True;
}
-catch ( WrappedTargetException )
+catch (const WrappedTargetException)
{
}
-catch ( Exception )
+catch (const Exception)
{
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
