[Libreoffice-commits] core.git: desktop/source filter/source scripting/source sfx2/source ucb/source wizards/com

[Mike Kaganski (via logerrit)]

 desktop/source/deployment/misc/dp_misc.cxx  |8 ++--
 filter/source/xsltfilter/XSLTFilter.cxx |   13 +++--
 scripting/source/basprov/basprov.cxx|5 ++---
 sfx2/source/doc/DocumentMetadataAccess.cxx  |3 +--
 sfx2/source/doc/doctemplates.cxx|   12 
 ucb/source/ucp/expand/ucpexpand.cxx |   11 +++
 wizards/com/sun/star/wizards/common/FileAccess.java |   10 +++---
 7 files changed, 26 insertions(+), 36 deletions(-)

New commits:
commit 00f6c36b603416b73e1327ac4c862b1eaca2d277
Author: Mike Kaganski 
AuthorDate: Mon Feb 13 11:22:03 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Feb 13 11:29:34 2023 +

Fix/simplify some vnd.sun.star.expand: handling

The vnd.sun.star.expand: payload must be URL-decoded prior to passing
it to expandMacros; the protocol must be checked case-insensitively.
Use startsWithIgnoreAsciiCase for that.

Change-Id: I2be993a0400a27cb7dc57207cd0824b4505afd2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146855
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/desktop/source/deployment/misc/dp_misc.cxx 
b/desktop/source/deployment/misc/dp_misc.cxx
index ea5c737c2d7b..ed394382bb5c 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -300,9 +300,7 @@ OUString expandUnoRcTerm( OUString const & term_ )
 OUString makeRcTerm( OUString const & url )
 {
 OSL_ASSERT( url.match( "vnd.sun.star.expand:" ));
-if (url.match( "vnd.sun.star.expand:" )) {
-// cut protocol:
-OUString rcterm( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) );
+if (OUString rcterm; url.startsWithIgnoreAsciiCase("vnd.sun.star.expand:", 
)) {
 // decode uric class chars:
 rcterm = ::rtl::Uri::decode(
 rcterm, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
@@ -315,9 +313,7 @@ OUString makeRcTerm( OUString const & url )
 
 OUString expandUnoRcUrl( OUString const & url )
 {
-if (url.match( "vnd.sun.star.expand:" )) {
-// cut protocol:
-OUString rcurl( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) );
+if (OUString rcurl; url.startsWithIgnoreAsciiCase("vnd.sun.star.expand:", 
)) {
 // decode uric class chars:
 rcurl = ::rtl::Uri::decode(
 rcurl, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx 
b/filter/source/xsltfilter/XSLTFilter.cxx
index 8ebbd874ed1e..f08933276055 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -207,20 +208,20 @@ namespace XSLT
 OUString
 XSLTFilter::expandUrl(const OUString& sUrl)
 {
-OUString sExpandedUrl;
 try
 {
+OUString sPreparedURL(sUrl);
+if 
(sPreparedURL.startsWithIgnoreAsciiCase("vnd.sun.star.expand:", ))
+sPreparedURL = rtl::Uri::decode(sPreparedURL, 
rtl_UriDecodeWithCharset,
+RTL_TEXTENCODING_UTF8);
 css::uno::Reference
 xMacroExpander = theMacroExpander::get(m_xContext);
-sExpandedUrl = xMacroExpander->expandMacros(sUrl);
-sal_Int32 nPos = sExpandedUrl.indexOf( "vnd.sun.star.expand:" 
);
-if (nPos != -1)
-sExpandedUrl = sExpandedUrl.copy(nPos + 20);
+return xMacroExpander->expandMacros(sPreparedURL);
 }
 catch (const Exception&)
 {
 }
-return sExpandedUrl;
+return {};
 }
 
 css::uno::Reference
diff --git a/scripting/source/basprov/basprov.cxx 
b/scripting/source/basprov/basprov.cxx
index d4afb41eaea3..cafd4daa76d0 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -103,10 +103,9 @@ namespace basprov
 }
 else if ( 
aScheme.equalsIgnoreAsciiCase("vnd.sun.star.pkg") )
 {
-OUString aAuthority = xUriRef->getAuthority();
-if ( aAuthority.matchIgnoreAsciiCase( 
"vnd.sun.star.expand:" ) )
+OUString aDecodedURL = xUriRef->getAuthority();
+if ( aDecodedURL.startsWithIgnoreAsciiCase( 
"vnd.sun.star.expand:",  ) )
 {
-OUString aDecodedURL( aAuthority.copy( sizeof ( 
"vnd.sun.star.expand:" ) - 1 ) );
 aDecodedURL = ::rtl::Uri::decode( aDecodedURL, 
rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
 Reference xMacroExpander =
 util::theMacroExpander::get(m_xContext);
diff --git 

[Libreoffice-commits] core.git: desktop/source filter/source

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx|6 +-
 filter/source/storagefilterdetect/filterdetect.cxx |7 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit b1560344c4ff2d1c5065eccdde31a8d4669510e4
Author: Mert Tumer 
AuthorDate: Wed Apr 6 16:59:53 2022 +0300
Commit: Henry Castro 
CommitDate: Thu Aug 11 14:59:00 2022 +0200

lok: load template documents as regular documents

otherwise lok cannot save them directly because
libreoffice will try to open a save-as dialog
For odg, change the draw8_template type draw8

Signed-off-by: Mert Tumer 
Change-Id: I34b0ed03adcac89eaa926f8ae6c57e6f622a90f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132633
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138074
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138098
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6f1135248675..7f27f96d9efa 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2563,10 +2563,14 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 document::MacroExecMode::NEVER_EXECUTE;
 #endif
 
+// set AsTemplate explicitly false to be able to load template files
+// as regular files, otherwise we cannot save them; it will try
+// to bring saveas dialog which cannot work with LOK case
 uno::Sequence aFilterOptions{
 comphelper::makePropertyValue("FilterOptions", sFilterOptions),
 comphelper::makePropertyValue("InteractionHandler", xInteraction),
-comphelper::makePropertyValue("MacroExecutionMode", nMacroExecMode)
+comphelper::makePropertyValue("MacroExecutionMode", 
nMacroExecMode),
+comphelper::makePropertyValue("AsTemplate", false)
 };
 
 /* TODO
diff --git a/filter/source/storagefilterdetect/filterdetect.cxx 
b/filter/source/storagefilterdetect/filterdetect.cxx
index 05eb74769b60..8312726e11da 100644
--- a/filter/source/storagefilterdetect/filterdetect.cxx
+++ b/filter/source/storagefilterdetect/filterdetect.cxx
@@ -33,6 +33,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using utl::MediaDescriptor;
 
@@ -103,6 +105,11 @@ OUString SAL_CALL 
StorageFilterDetect::detect(uno::SequencegetPropertyValue( "MediaType" ) >>= aMediaType;
 aTypeName = getInternalFromMediaType( aMediaType );
+if (comphelper::LibreOfficeKit::isActive() && aTypeName == 
"draw8_template")
+{
+// save it as draw8 instead of template format
+aTypeName = "draw8";
+}
 }
 
 catch( const lang::WrappedTargetException& aWrap )

[Libreoffice-commits] core.git: desktop/source filter/source sfx2/source sw/inc sw/source

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx |1 +
 filter/source/svg/svgexport.cxx |6 +-
 filter/source/svg/svgfilter.cxx |   10 ++
 filter/source/svg/svgfilter.hxx |1 +
 filter/source/svg/svgwriter.cxx |   22 +-
 filter/source/svg/svgwriter.hxx |2 ++
 sfx2/source/doc/objstor.cxx |   16 
 sw/inc/cmdid.h  |1 +
 sw/inc/unoprnms.hxx |1 +
 sw/source/core/unocore/unoframe.cxx |   16 +++-
 sw/source/core/unocore/unomap1.cxx  |1 +
 11 files changed, 74 insertions(+), 3 deletions(-)

New commits:
commit f609a16a52f1ac37f1edd297cf1d9e5f2a294724
Author: Szymon Kłos 
AuthorDate: Mon Jan 31 17:15:21 2022 +0100
Commit: Szymon Kłos 
CommitDate: Sat Feb 5 12:15:28 2022 +0100

lok: render image preview with lower resolution

renderShapeSelection callback is used to render
image previews which are later used during
eg. rotation.

Do not render preview with original size which
slows down app a lot. Use 1280x720 max.

Change-Id: Ia8365a67d87cea869ef74cb70ce4830439a523b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129376
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129497
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f9b1d3e0ea96..45aa9ad4cbfb 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3953,6 +3953,7 @@ static size_t 
doc_renderShapeSelection(LibreOfficeKitDocument* pThis, char** pOu
 }
 aMediaDescriptor["SelectionOnly"] <<= true;
 aMediaDescriptor["OutputStream"] <<= xOut;
+aMediaDescriptor["IsPreview"] <<= true; // will down-scale graphics
 
 xStorable->storeToURL("private:stream", 
aMediaDescriptor.getAsConstPropertyValueList());
 
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ef0c1ea37a80..c21b041b1bbc 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -796,7 +796,9 @@ bool SVGFilter::implExportWriterTextGraphic( const 
Reference< view::XSelectionSu
 const Graphic aOriginalGraphic(xOriginalGraphic);
 
 uno::Reference xTransformedGraphic;
-xPropertySet->getPropertyValue("TransformedGraphic") >>= 
xTransformedGraphic;
+xPropertySet->getPropertyValue(
+mbIsPreview ? OUString("GraphicPreview") : 
OUString("TransformedGraphic"))
+>>= xTransformedGraphic;
 
 if (!xTransformedGraphic.is())
 return false;
@@ -971,6 +973,8 @@ bool SVGFilter::implExportDocument()
 mpSVGWriter->SetEmbeddedBitmapRefs(  );
 implExportTiledBackground();
 }
+if( mbIsPreview )
+mpSVGWriter->SetPreviewMode();
 
 // #i124608# export a given object selection, so no MasterPage 
export at all
 if (!mbExportShapeSelection)
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 4c3f033d02eb..c6677bf0c9dc 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -77,6 +77,7 @@ SVGFilter::SVGFilter( const Reference< XComponentContext >& 
rxCtx ) :
 mnVisiblePage( -1 ),
 mpObjects( nullptr ),
 mbExportShapeSelection(false),
+mbIsPreview(false),
 mbWriterFilter(false),
 mbCalcFilter(false),
 mbImpressFilter(false),
@@ -106,6 +107,15 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< 
PropertyValue >& rDescripto
 if(!mxSrcDoc)
 return false;
 
+for (const PropertyValue& rProp : rDescriptor)
+{
+if (rProp.Name == "IsPreview")
+{
+rProp.Value >>= mbIsPreview;
+break;
+}
+}
+
 for (const PropertyValue& rProp : rDescriptor)
 {
 if (rProp.Name == "FilterName")
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index eb889e81662e..93e14ec41671 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -209,6 +209,7 @@ private:
 Sequence< PropertyValue >   maFilterData;
 Reference< css::drawing::XDrawPage > mxDefaultPage;
 std::vector< Reference< css::drawing::XDrawPage > > mSelectedPages;
+boolmbIsPreview;
 
 boolmbWriterFilter;
 boolmbCalcFilter;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 3d8183ebb2fd..f849315ce823 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2942,7 +2942,27 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& 
rBmpEx,
 }
 }
 
-if( !(bCached || GraphicConverter::Export( aOStm, rBmpEx, 
ConvertDataFormat::PNG ) == ERRCODE_NONE) )
+const BitmapEx* pBitmap = 
+std::unique_ptr pNewBitmap;
+
+// for preview 

[Libreoffice-commits] core.git: desktop/source filter/source include/comphelper offapi/com sc/source svtools/source vcl/source

[Andrea Gelmini (via logerrit)]

 desktop/source/app/app.cxx  |2 +-
 filter/source/msfilter/msdffimp.cxx |2 +-
 include/comphelper/configurationhelper.hxx  |2 +-
 offapi/com/sun/star/embed/StorageStream.idl |2 +-
 sc/source/ui/unoobj/cursuno.cxx |2 +-
 sc/source/ui/unoobj/datauno.cxx |2 +-
 svtools/source/misc/sampletext.cxx  |4 ++--
 vcl/source/window/floatwin.cxx  |2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit eced5a20b5db1364aa9feb50dfc8e55b34324b9e
Author: Andrea Gelmini 
AuthorDate: Tue Sep 3 00:19:40 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 3 10:29:41 2019 +0200

Fix typos

Change-Id: I7eacff7dd5bf1e8ae70d2bca0bc852b8a45c
Reviewed-on: https://gerrit.libreoffice.org/78428
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1071dab7ce07..b733080fd94a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1165,7 +1165,7 @@ void Desktop::Exception(ExceptionCategory nCategory)
 ( !rArgs.IsNoRestore() 
   ) && // some use cases of office must work without recovery
 ( !rArgs.IsHeadless()  
   ) &&
 ( nCategory != 
ExceptionCategory::UserInterface ) && // recovery can't work without UI ... but 
UI layer seems to be the reason for this crash
-( 
Application::IsInExecute()   )// crashes during startup and 
shutdown should be ignored (they indicates a corrupt installation ...)
+( 
Application::IsInExecute()   )// crashes during startup and 
shutdown should be ignored (they indicate a corrupted installation...)
   );
 if ( bAllowRecoveryAndSessionManagement )
 {
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index c3ee81c39d32..17be716f50c8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2866,7 +2866,7 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& 
aSet,MSO_FillType eMSO_
 nChgColors ^= 1;
 }
 //if the type is linear or axial, just save focus to nFocusX and nFocusY 
for export
-//Core function does no need them. They serves for rect gradient(CenterXY).
+//Core function does no need them. They serve for rect gradient(CenterXY).
 sal_uInt16 nFocusX = static_cast(nFocus);
 sal_uInt16 nFocusY = static_cast(nFocus);
 
diff --git a/include/comphelper/configurationhelper.hxx 
b/include/comphelper/configurationhelper.hxx
index eb9e7b8fd3f5..5c50aa9f5dff 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -159,7 +159,7 @@ public:
  *  all operations are made relative to this access point.
  *
  *  Further this method must be used only with configuration set's.
- *  Atomic keys can't be "created" ... they "exists every time".
+ *  Atomic keys can't be "created"... they "exist every time".
  *
  *  @param  xCFG
  *  the configuration root, where sRelPathToSet should be 
interpreted
diff --git a/offapi/com/sun/star/embed/StorageStream.idl 
b/offapi/com/sun/star/embed/StorageStream.idl
index cb90b6a08496..8388e2ac8213 100644
--- a/offapi/com/sun/star/embed/StorageStream.idl
+++ b/offapi/com/sun/star/embed/StorageStream.idl
@@ -84,7 +84,7 @@ published service StorageStream
 
 
 When a stream is disposed all the changes that were done for it are
-automatically flashed, so that they becomes visible from parent
+automatically flashed, so that they become visible from parent
 storage. It is also possible to flash the stream explicitly.
 
 
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 28e6c92f6f50..dd9b03c57e83 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -127,7 +127,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray()
 }
 }
 // that's a Bug, that this assertion comes; the API Reference says, that
-// if there is no Matrix, the Range is left unchanged; they says nothing
+// if there is no Matrix, the Range is left unchanged; they say nothing
 // about an exception
 /*if (!bFound)
 {
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 89064f898c31..596da506ad14 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -533,7 +533,7 @@ ScSubTotalDescriptorBase::~ScSubTotalDescriptorBase()
 {
 }
 
-// XSubTotalDesctiptor
+// XSubTotalDescriptor
 
 ScSubTotalFieldObj* 

[Libreoffice-commits] core.git: desktop/source filter/source include/basegfx slideshow/source sw/source

[Andrea Gelmini (via logerrit)]

 desktop/source/lib/init.cxx  |2 +-
 filter/source/xslt/import/wordml/wordml2ooo_draw.xsl |2 +-
 include/basegfx/polygon/b2dpolygontools.hxx  |2 +-
 slideshow/source/engine/shapes/appletshape.cxx   |2 +-
 slideshow/source/engine/slide/layer.hxx  |2 +-
 slideshow/source/engine/transitions/ellipsewipe.hxx  |2 +-
 slideshow/source/engine/transitions/iriswipe.hxx |2 +-
 slideshow/source/engine/usereventqueue.cxx   |2 +-
 slideshow/source/inc/eventmultiplexer.hxx|2 +-
 slideshow/source/inc/listenercontainer.hxx   |2 +-
 slideshow/source/inc/shapeattributelayer.hxx |2 +-
 slideshow/source/inc/soundplayer.hxx |2 +-
 sw/source/filter/html/parcss1.cxx|4 ++--
 13 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 9b39866149aad91c79ea276c2a484c282f8ad6e1
Author: Andrea Gelmini 
AuthorDate: Thu Aug 1 22:44:25 2019 +0200
Commit: Andrea Gelmini 
CommitDate: Fri Aug 2 07:24:31 2019 +0200

Fix typos

Change-Id: Ic7b6014e09e3ee1a1b4917008a267b8fa2dbc1f5
Reviewed-on: https://gerrit.libreoffice.org/76814
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2ecf065de95d..4b808f4b1c1b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2138,7 +2138,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 // add interaction handler too
 if (gImpl)
 {
-// gImpl does not have to exist when running from an unit test
+// gImpl does not have to exist when running from a unit test
 rtl::Reference const pInteraction(
 new LOKInteractionHandler("saveas", gImpl, pDocument));
 uno::Reference const 
xInteraction(pInteraction.get());
diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl 
b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
index 169aa364a4d2..3226f0d1c6aa 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
@@ -1977,7 +1977,7 @@
 
 
 
-
+
 
 
 
diff --git a/include/basegfx/polygon/b2dpolygontools.hxx 
b/include/basegfx/polygon/b2dpolygontools.hxx
index a1efbd9aec86..565f8013ffe9 100644
--- a/include/basegfx/polygon/b2dpolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolygontools.hxx
@@ -277,7 +277,7 @@ namespace basegfx
  */
 BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromEllipse( const B2DPoint& 
rCenter, double fRadiusX, double fRadiusY, sal_uInt32 nStartQuadrant = 0);
 
-/** Create an unit ellipse polygon with the given angles, from start 
to end
+/** Create a unit ellipse polygon with the given angles, from start to 
end
  */
 BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromEllipseSegment( const 
B2DPoint& rCenter, double fRadiusX, double fRadiusY, double fStart, double fEnd 
);
 
diff --git a/slideshow/source/engine/shapes/appletshape.cxx 
b/slideshow/source/engine/shapes/appletshape.cxx
index ce20c907ae1b..46f75e18f417 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -45,7 +45,7 @@ namespace slideshow
 class AppletShape : public ExternalShapeBase
 {
 public:
-/** Create a shape for the given XShape for a applet object
+/** Create a shape for the given XShape for an applet object
 
 @param xShape
 The XShape to represent.
diff --git a/slideshow/source/engine/slide/layer.hxx 
b/slideshow/source/engine/slide/layer.hxx
index 95a5f7d4402c..2da9d66c7b48 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -189,7 +189,7 @@ namespace slideshow
 EndUpdater is destroyed, the Layer leaves update mode
 again.
 
-@return a update end RAII object.
+@return an update end RAII object.
 */
 EndUpdater beginUpdate();
 
diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx 
b/slideshow/source/engine/transitions/ellipsewipe.hxx
index ea0cf8944984..88463ec6250f 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.hxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.hxx
@@ -26,7 +26,7 @@
 namespace slideshow {
 namespace internal {
 
-/// Generate a iris wipe
+/// Generate an iris wipe
 class EllipseWipe : public ParametricPolyPolygon
 {
 public:
diff --git a/slideshow/source/engine/transitions/iriswipe.hxx 
b/slideshow/source/engine/transitions/iriswipe.hxx
index b39087d6d440..966badee58bc 100644
--- a/slideshow/source/engine/transitions/iriswipe.hxx
+++ b/slideshow/source/engine/transitions/iriswipe.hxx
@@ -28,7 

[Libreoffice-commits] core.git: desktop/source filter/source

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |   26 ++
 filter/source/pdf/pdfexport.cxx |   74 
 filter/source/pdf/pdfexport.hxx |3 +
 3 files changed, 103 insertions(+)

New commits:
commit dd3d5f7c15ab701c57d29f5c60e1164a0834ca00
Author: merttumer 
AuthorDate: Wed Feb 13 17:59:30 2019 +0300
Commit: Mert Tümer 
CommitDate: Mon Mar 18 13:03:28 2019 +0100

Added tiled watermark export option for pdf

Change-Id: I3f28ad64c13dd4bc1b2862e86d2190e46a0ced46
Signed-off-by: merttumer 
Reviewed-on: https://gerrit.libreoffice.org/67779
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4662fb616c6e..bc5c9b74beba 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1905,6 +1905,25 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 
 OUString aFilterOptions = getUString(pFilterOptions);
 
+// Check if watermark for pdf is passed by filteroptions..
+// It is not a real filter option so it must be filtered out.
+OUString watermarkText;
+int aIndex = -1;
+if ((aIndex = aFilterOptions.indexOf(",Watermark=")) >= 0)
+{
+int bIndex = aFilterOptions.indexOf("WATERMARKEND");
+watermarkText = aFilterOptions.copy(aIndex+11, bIndex-(aIndex+11));
+if(aIndex > 0)
+{
+OUString temp = aFilterOptions.copy(0, aIndex);
+aFilterOptions = temp + aFilterOptions.copy(bIndex+12);
+}
+else
+{
+aFilterOptions.clear();
+}
+}
+
 // 'TakeOwnership' == this is a 'real' SaveAs (that is, the document
 // gets a new name).  When this is not provided, the meaning of
 // saveAs() is more like save-a-copy, which allows saving to any
@@ -1930,6 +1949,13 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 auto aFilteredOptionSeq = 
comphelper::containerToSequence(aFilteredOptionVec);
 aFilterOptions = 
comphelper::string::convertCommaSeparated(aFilteredOptionSeq);
 aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS()] <<= 
aFilterOptions;
+if(!watermarkText.isEmpty())
+{
+uno::Sequence< beans::PropertyValue > aFilterData( 1 );
+aFilterData[ 0 ].Name = "TiledWatermark";
+aFilterData[ 0 ].Value <<= watermarkText;
+aSaveMediaDescriptor["FilterData"] <<= aFilterData;
+}
 
 // add interaction handler too
 if (gImpl)
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 2ca3829db36a..42ec1e8f23c6 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -525,6 +525,8 @@ bool PDFExport::Export( const OUString& rFile, const 
Sequence< PropertyValue >&
 rFilterData[ nData ].Value >>= mbAddStream;
 else if ( rFilterData[ nData ].Name == "Watermark" )
 rFilterData[ nData ].Value >>= msWatermark;
+else if ( rFilterData[ nData ].Name == "TiledWatermark" )
+rFilterData[ nData ].Value >>= msTiledWatermark;
 // now all the security related properties...
 else if ( rFilterData[ nData ].Name == "EncryptFile" )
 rFilterData[ nData ].Value >>= mbEncrypt;
@@ -1077,7 +1079,13 @@ void PDFExport::ImplExportPage( vcl::PDFWriter& rWriter, 
vcl::PDFExtOutDevData&
 rPDFExtOutDevData.ResetSyncData();
 
 if (!msWatermark.isEmpty())
+{
 ImplWriteWatermark( rWriter, Size(aRangePDF.getWidth(), 
aRangePDF.getHeight()) );
+}
+else if (!msTiledWatermark.isEmpty())
+{
+ImplWriteTiledWatermark( rWriter, Size(aRangePDF.getWidth(), 
aRangePDF.getHeight()) );
+}
 }
 
 
@@ -1148,4 +1156,70 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter& 
rWriter, const Size& rPageSi
 rWriter.Pop();
 }
 
+void PDFExport::ImplWriteTiledWatermark( vcl::PDFWriter& rWriter, const Size& 
rPageSize )
+{
+vcl::Font aFont( OUString( "Liberation Sans" ), Size( 0, 40 ) );
+aFont.SetItalic( ITALIC_NONE );
+aFont.SetWidthType( WIDTH_NORMAL );
+aFont.SetWeight( WEIGHT_NORMAL );
+aFont.SetAlignment( ALIGN_BOTTOM );
+aFont.SetFontHeight(40);
+
+OutputDevice* pDev = rWriter.GetReferenceDevice();
+pDev->SetFont(aFont);
+pDev->Push();
+pDev->SetFont(aFont);
+pDev->SetMapMode( MapMode( MapUnit::MapPoint ) );
+int w = 0;
+long nTextWidth = (rPageSize.Width()-60) / 4;
+while((w = pDev->GetTextWidth(msTiledWatermark)) > nTextWidth)
+{
+if(w==0)
+break;
+
+long nNewHeight = aFont.GetFontHeight() * nTextWidth / w;
+aFont.SetFontHeight(nNewHeight);
+pDev->SetFont( aFont );
+}
+pDev->Pop();
+
+rWriter.Push();
+

[Libreoffice-commits] core.git: desktop/source filter/source include/sfx2 include/vcl sfx2/source vcl/source

[Libreoffice Gerrit user]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   29 --
 desktop/source/deployment/gui/dp_gui_dialog2.hxx |   13 --
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |   26 -
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx |6 ++-
 include/sfx2/sfxhelp.hxx |2 -
 include/vcl/waitobj.hxx  |   15 +++
 sfx2/source/appl/sfxhelp.cxx |   37 +++
 vcl/source/window/dialog.cxx |   25 
 8 files changed, 59 insertions(+), 94 deletions(-)

New commits:
commit e94dc6f63a05ab7744b720847c13bd0e2f674417
Author: Caolán McNamara 
AuthorDate: Thu Jan 10 10:44:31 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Jan 11 11:57:24 2019 +0100

Resolves: tdf#122404 unlock just the toplevels that were locked

push what toplevels got locked to just unlock those ones. otherwise the just
dismissed toplevel may still be present in the Application toplevel list.

merge all the similar examples of this.

Change-Id: I77c0d55d1e4b3bcc3b8d88fef00ba289edd1e831
Reviewed-on: https://gerrit.libreoffice.org/66076
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 28bfeee06b53..46649607e212 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -340,7 +340,6 @@ DialogHelper::DialogHelper(const uno::Reference< 
uno::XComponentContext > 
Dialog *pWindow)
 : m_xVCLWindow(pWindow)
 , m_nEventID(nullptr)
-, m_nBusy(0)
 {
 m_xContext = xContext;
 }
@@ -462,34 +461,6 @@ void DialogHelper::PostUserEvent( const Link& 
rLink, void* pCaller )
 m_nEventID = Application::PostUserEvent( rLink, pCaller, 
true/*bReferenceLink*/ );
 }
 
-void DialogHelper::incBusy()
-{
-++m_nBusy;
-// lock any toplevel windows from being closed until busy is over
-// ensure any dialogs are reset before entering
-vcl::Window *xTopWin = Application::GetFirstTopLevelWindow();
-while (xTopWin)
-{
-if (xTopWin != m_xVCLWindow)
-xTopWin->IncModalCount();
-xTopWin = Application::GetNextTopLevelWindow(xTopWin);
-}
-}
-
-void DialogHelper::decBusy()
-{
---m_nBusy;
-// unlock any toplevel windows from being closed until busy is over
-// ensure any dialogs are reset before entering
-vcl::Window *xTopWin = Application::GetFirstTopLevelWindow();
-while (xTopWin)
-{
-if (xTopWin != m_xVCLWindow)
-xTopWin->DecModalCount();
-xTopWin = Application::GetNextTopLevelWindow(xTopWin);
-}
-}
-
 // ExtMgrDialog
 ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager 
*pManager, Dialog::InitFlag eFlag)
 : ModelessDialog(pParent, "ExtensionManagerDialog", 
"desktop/ui/extensionmanager.ui", eFlag)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index dd0dc8bb8160..a2d88c0f458e 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -47,6 +48,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 namespace dp_gui {
 
 
@@ -60,7 +64,7 @@ class DialogHelper
 css::uno::Reference< css::uno::XComponentContext > m_xContext;
 VclPtr  m_xVCLWindow;
 ImplSVEvent *   m_nEventID;
-int m_nBusy;
+TopLevelWindowLocker m_aBusy;
 
 public:
 DialogHelper( const css::uno::Reference< 
css::uno::XComponentContext > &,
@@ -91,14 +95,13 @@ public:
const char* pResID,
bool  );
 
-voidincBusy();
-voiddecBusy();
-boolisBusy() const { return m_nBusy > 0; }
+voidincBusy() { m_aBusy.incBusy(m_xVCLWindow); }
+voiddecBusy() { m_aBusy.decBusy(); }
+boolisBusy() const { return m_aBusy.isBusy(); }
 boolinstallExtensionWarn(const OUString );
 boolinstallForAllUsers(bool );
 };
 
-
 class ExtMgrDialog : public ModelessDialog,
  public DialogHelper
 {
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 036cfcb95d89..e5bbba97ee3e 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -133,32 +133,6 @@ void XMLFilterSettingsDialog::dispose()
 ModelessDialog::dispose();
 }
 
-void XMLFilterSettingsDialog::incBusy()
-{
-// lock any 

[Libreoffice-commits] core.git: desktop/source filter/source idlc/source include/IwyuFilter_include.yaml include/osl sal/osl sal/qa shell/source unoidl/source

[Gabor Kelemen]

 desktop/source/app/app.cxx |1 +
 desktop/source/app/dispatchwatcher.cxx |1 +
 desktop/source/deployment/dp_persmap.cxx   |1 +
 filter/source/graphicfilter/ieps/ieps.cxx  |1 +
 idlc/source/idlccompile.cxx|1 +
 include/IwyuFilter_include.yaml|   12 
 include/osl/file.hxx   |4 +---
 sal/osl/unx/file.cxx   |1 +
 sal/qa/osl/file/osl_File.cxx   |1 +
 shell/source/backends/desktopbe/desktopbackend.cxx |1 +
 unoidl/source/unoidl-write.cxx |1 +
 11 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 6b51fee8d264db616d1be32676f0f691acbfe680
Author: Gabor Kelemen 
Date:   Fri Jun 29 18:22:01 2018 +0200

tdf#42949 Fix IWYU warnings in include/osl/*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I7b19938246ca8498fa300f781589bf17b3d486aa
Reviewed-on: https://gerrit.libreoffice.org/56723
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cb67abaa8fd9..e459ccdace81 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -99,6 +99,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index 6438bf7f3ef8..d45b6ab12f9d 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -61,6 +61,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::osl;
diff --git a/desktop/source/deployment/dp_persmap.cxx 
b/desktop/source/deployment/dp_persmap.cxx
index 83074def69eb..c06c63656e6f 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::rtl;
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index e737b8ba8d82..6a422f1f6b09 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index ca6a8ebeb10a..c8a389025325 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index f679943627c1..5e9a818b379d 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -22,3 +22,15 @@ blacklist:
 include/osl/thread.h:
 # ODK API test would fail with fw decl here
 - osl/time.h
+include/osl/conditn.hxx:
+# ODK API test would fail with fw decl here
+- osl/time.h
+include/osl/pipe_decl.hxx:
+# ODK API test would fail with fw decl here
+- osl/security.hxx
+include/osl/socket_decl.hxx:
+# Needed by socket.hxx for inline function
+- rtl/byteseq.hxx
+include/osl/thread.hxx:
+# ODK API test would fail with fw decl here
+- osl/time.h
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 6d1a755ac422..a85f5fc7aeb0 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -24,7 +24,6 @@
 
 #include 
 
-#include 
 #include 
 
 #include "sal/log.hxx"
@@ -33,9 +32,8 @@
 
 #include "osl/file.h"
 #include "osl/diagnose.h"
-#include "rtl/byteseq.hxx"
 
-#include 
+namespace rtl { class ByteSequence; }
 
 namespace osl
 {
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index c2cbf768588b..40aadc940e88 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "system.hxx"
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 5261cb6511f2..5027f934c084 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index 7fa007689095..369de240859a 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/unoidl/source/unoidl-write.cxx b/unoidl/source/unoidl-write.cxx
index fcb004a24df3..083f7a5b7b1f 100644
--- a/unoidl/source/unoidl-write.cxx
+++ b/unoidl/source/unoidl-write.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

[Libreoffice-commits] core.git: desktop/source filter/source framework/source include/svx include/vcl registry/source sal/rtl sc/inc sc/qa sc/source svx/source sw/inc sw/source vcl/source

[Noel Grandin]

 desktop/source/deployment/inc/dp_update.hxx  |3 
 desktop/source/deployment/manager/dp_informationprovider.cxx |4 
 desktop/source/deployment/misc/dp_update.cxx |4 
 filter/source/msfilter/eschesdo.cxx  |9 -
 filter/source/msfilter/eschesdo.hxx  |3 
 framework/source/uielement/statusbarmerger.cxx   |5 
 include/svx/txencbox.hxx |4 
 include/vcl/toolbox.hxx  |2 
 registry/source/reflread.cxx |8 -
 sal/rtl/alloc_arena.cxx  |4 
 sal/rtl/alloc_arena.hxx  |4 
 sal/rtl/alloc_cache.cxx  |4 
 sal/rtl/strimp.cxx   |2 
 sc/inc/postit.hxx|9 -
 sc/qa/unit/helper/qahelper.cxx   |4 
 sc/qa/unit/helper/qahelper.hxx   |2 
 sc/qa/unit/ucalc_formula.cxx |2 
 sc/source/core/data/postit.cxx   |4 
 sc/source/filter/excel/xiescher.cxx  |3 
 sc/source/filter/xml/xmlcelli.cxx|2 
 sc/source/ui/attrdlg/scdlgfact.cxx   |2 
 sc/source/ui/inc/delcodlg.hxx|2 
 sc/source/ui/miscdlgs/delcodlg.cxx   |8 -
 svx/source/dialog/txencbox.cxx   |   22 
 sw/inc/ndgrf.hxx |1 
 sw/source/core/doc/DocumentContentOperationsManager.cxx  |2 
 sw/source/core/graphic/ndgrf.cxx |   26 -
 sw/source/ui/chrdlg/numpara.cxx  |9 -
 sw/source/uibase/dbui/dbmgr.cxx  |8 -
 sw/source/uibase/inc/numpara.hxx |2 
 vcl/source/control/longcurr.cxx  |   57 ---
 vcl/source/window/menuitemlist.cxx   |2 
 vcl/source/window/menuitemlist.hxx   |4 
 vcl/source/window/toolbox.cxx|4 
 34 files changed, 76 insertions(+), 155 deletions(-)

New commits:
commit f3049f68584811bb897873f35e0c302898af2d31
Author: Noel Grandin 
Date:   Wed Apr 25 18:56:17 2018 +0200

loplugin:constantparam

Change-Id: I966dcf87be021520e7cc394338b9c0574bb8afee
Reviewed-on: https://gerrit.libreoffice.org/53541
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/desktop/source/deployment/inc/dp_update.hxx 
b/desktop/source/deployment/inc/dp_update.hxx
index 390fb0c6ee87..107857dbeb31 100644
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
@@ -125,11 +125,10 @@ UpdateInfoMap getOnlineUpdateInfos(
 std::vector< std::pair< css::uno::Reference<
 css::deployment::XPackage>, css::uno::Any> > & out_errors);
 
-/* retunrs the highest version from the provided arguments.
+/* returns the highest version from the provided arguments.
 */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 OUString getHighestVersion(
-OUString const & userVersion,
 OUString const & sharedVersion,
 OUString const & bundledVersion,
 OUString const & onlineVersion);
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx 
b/desktop/source/deployment/manager/dp_informationprovider.cxx
index c95fc229973d..5088c2e63e95 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -237,10 +237,10 @@ PackageInformationProvider::isUpdateAvailable( const 
OUString& _sExtensionId )
 OUString updateVersionShared;
 if (sourceUser != dp_misc::UPDATE_SOURCE_NONE)
 updateVersionUser = dp_misc::getHighestVersion(
-OUString(), sVersionShared, sVersionBundled, sOnlineVersion);
+sVersionShared, sVersionBundled, sOnlineVersion);
 if (sourceShared  != dp_misc::UPDATE_SOURCE_NONE)
 updateVersionShared = dp_misc::getHighestVersion(
-OUString(), OUString(), sVersionBundled, sOnlineVersion);
+OUString(), sVersionBundled, sOnlineVersion);
 OUString updateVersion;
 if (dp_misc::compareVersions(updateVersionUser, updateVersionShared) 
== dp_misc::GREATER)
 updateVersion = updateVersionUser;
diff --git a/desktop/source/deployment/misc/dp_update.cxx 
b/desktop/source/deployment/misc/dp_update.cxx
index 605ace6a5f44..05b23c9cd3f5 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ 

[Libreoffice-commits] core.git: desktop/source filter/source sal/rtl

[Muhammet Kara]

 desktop/source/lib/init.cxx   |4 +---
 filter/source/graphicfilter/iras/iras.cxx |6 +++---
 sal/rtl/random.cxx|2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 9c4eaa7b81a40d97fe49b85272b40bfeaaf44f86
Author: Muhammet Kara 
Date:   Sun Apr 15 12:33:03 2018 +0300

cppcheck: variableScope & unreadVariable

Change-Id: Iaa3adc54d547e243b977a562fa4dbc2b9b9c6592
Reviewed-on: https://gerrit.libreoffice.org/52905
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6e4d1cff8556..07c2226c8717 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2841,7 +2841,6 @@ static char* getStyles(LibreOfficeKitDocument* pThis, 
const char* pCommand)
 // Header & Footer Styles
 {
 OUString sName;
-bool bIsPhysical;
 boost::property_tree::ptree aChild;
 boost::property_tree::ptree aChildren;
 const OUString sPageStyles("PageStyles");
@@ -2853,6 +2852,7 @@ static char* getStyles(LibreOfficeKitDocument* pThis, 
const char* pCommand)
 uno::Sequence aSeqNames = xContainer->getElementNames();
 for (sal_Int32 itName = 0; itName < aSeqNames.getLength(); 
itName++)
 {
+bool bIsPhysical;
 sName = aSeqNames[itName];
 xProperty.set(xContainer->getByName(sName), uno::UNO_QUERY);
 if (xProperty.is() && 
(xProperty->getPropertyValue("IsPhysical") >>= bIsPhysical) && bIsPhysical)
@@ -2861,8 +2861,6 @@ static char* getStyles(LibreOfficeKitDocument* pThis, 
const char* pCommand)
 aChild.put("", sName.toUtf8());
 aChildren.push_back(std::make_pair("", aChild));
 }
-else
-bIsPhysical = false;
 }
 aValues.add_child("HeaderFooter", aChildren);
 }
diff --git a/filter/source/graphicfilter/iras/iras.cxx 
b/filter/source/graphicfilter/iras/iras.cxx
index c0d7a6c7fb82..30e00d45f9e1 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -96,12 +96,13 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 if ( !mbStatus )
 return false;
 
-bool bPalette(false);
 std::vector aPalette;
-
 bool bOk = true;
+
 if ( mnDstBitsPerPix <= 8 ) // pallets pictures
 {
+bool bPalette(false);
+
 if ( mnColorMapType == RAS_COLOR_RAW_MAP )  // RAW color map is 
skipped
 {
 sal_uLong nCurPos = m_rRAS.Tell();
@@ -144,7 +145,6 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 sal_uLong nCount = 255 - ( 255 * i / ( mnDstColors - 1 ) );
 aPalette[i] = Color(static_cast(nCount), 
static_cast(nCount), static_cast(nCount));
 }
-bPalette = true;
 }
 }
 else
diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx
index 1046b769..158e8fff3cc5 100644
--- a/sal/rtl/random.cxx
+++ b/sal/rtl/random.cxx
@@ -234,12 +234,12 @@ static void readPool (
 rtlRandomPool SAL_CALL rtl_random_createPool() SAL_THROW_EXTERN_C()
 {
 RandomPool_Impl *pImpl = nullptr;
-char sanity[4];
 
 /* try to get system random number, if it fail fall back on own pool */
 pImpl = static_cast< RandomPool_Impl* 
>(rtl_allocateZeroMemory(sizeof(RandomPool_Impl)));
 if (pImpl)
 {
+char sanity[4];
 if (!osl_get_system_random_data(sanity, 4))
 {
 if (!initPool(pImpl))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source filter/source i18npool/source include/basic include/osl jurt/com odk/examples offapi/com qadevOOo/tests sd/source sw/source winaccessibility/source write

[Andrea Gelmini]

 desktop/source/deployment/inc/lockfile.hxx |2 +-
 filter/source/xslt/export/wordml/ooo2wordml_draw.xsl   |2 +-
 i18npool/source/breakiterator/data/README  |2 +-
 include/basic/sbstar.hxx   |2 +-
 include/osl/file.hxx   |6 
+++---
 jurt/com/sun/star/uno/MappingException.java|6 
+++---
 odk/examples/examples.html |2 +-
 offapi/com/sun/star/drawing/framework/XConfigurationController.idl |2 +-
 qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java |2 +-
 sd/source/ui/inc/fusel.hxx |2 +-
 sw/source/core/layout/frmtool.cxx  |2 +-
 sw/source/filter/ww8/ww8par6.cxx   |2 +-
 sw/source/uibase/app/docsh2.cxx|2 +-
 winaccessibility/source/UAccCOM/EnumVariant.cxx|4 ++--
 writerfilter/source/dmapper/DomainMapper.cxx   |2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit c66fe94d3e9cc1394dd4b569a3d8f374208a729b
Author: Andrea Gelmini 
Date:   Wed Jan 17 00:31:43 2018 +0100

Fix typos

Change-Id: I5fff9ccb1bc74b85ee378439ffa2272583ffcb0f
Reviewed-on: https://gerrit.libreoffice.org/48024
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/desktop/source/deployment/inc/lockfile.hxx 
b/desktop/source/deployment/inc/lockfile.hxx
index 8e2fea7b60dc..07dbc3446f3d 100644
--- a/desktop/source/deployment/inc/lockfile.hxx
+++ b/desktop/source/deployment/inc/lockfile.hxx
@@ -57,7 +57,7 @@ namespace desktop {
 {
 public:
 
-// contructs a new lockfile onject
+// constructs a new lockfile onject
 Lockfile( bool bIPCserver = true );
 
 // separating GUI code:
diff --git a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl 
b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
index 18495dcf2c2f..3e009aefafc8 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
@@ -967,7 +967,7 @@
 
 
 
-
+
 
 
 
diff --git a/i18npool/source/breakiterator/data/README 
b/i18npool/source/breakiterator/data/README
index 65c1f46a1c1b..a95306608887 100644
--- a/i18npool/source/breakiterator/data/README
+++ b/i18npool/source/breakiterator/data/README
@@ -37,7 +37,7 @@ Author: Rüdiger Timm 
 Date:   Wed Jul 2 07:52:44 2008 +
 
 INTEGRATION: CWS i18n41 (1.9.12); FILE MERGED
-2008/06/17 20:22:30 khong 1.9.12.2: i83229 fix the problem of leading 
hyphen for nubmers
+2008/06/17 20:22:30 khong 1.9.12.2: i83229 fix the problem of leading 
hyphen for numbers
 2008/04/23 06:20:16 khong 1.9.12.1: i72868, i80891, i83229, fix Chinese 
punctuations and hyphen for line breakiterator
 
 commit 55dff22611659a1567c968fbf9e512a2765ab62e
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 8774f524c6c0..86b0d8e7a0c6 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -86,7 +86,7 @@ public:
 
 StarBASIC( StarBASIC* pParent = nullptr, bool bIsDocBasic = false );
 
-// #51727 SetModified overridden so that the Modfied-State is
+// #51727 SetModified overridden so that the Modified-State is
 // not delivered to Parent.
 virtual void SetModified( bool ) override;
 
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 73065a4ebcec..f6764f14ed27 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -412,7 +412,7 @@ class VolumeInfo
 
 VolumeInfo( VolumeInfo& ) SAL_DELETED_FUNCTION;
 
-/** Assginment operator.
+/** Assignment operator.
 */
 
 VolumeInfo& operator = ( VolumeInfo& ) SAL_DELETED_FUNCTION;
@@ -460,7 +460,7 @@ public:
 return (_aInfo.uAttributes & osl_Volume_Attribute_Remote) != 0;
 }
 
-/** Check the removeable flag.
+/** Check the removable flag.
 
 @return
 true if attributes are valid and the volume is removable else false.
@@ -896,7 +896,7 @@ class File: public FileBase
 
 File( File& ) SAL_DELETED_FUNCTION;
 
-/** Assginment operator.
+/** Assignment operator.
 */
 
 File& operator = ( File& ) SAL_DELETED_FUNCTION;
diff --git a/jurt/com/sun/star/uno/MappingException.java 
b/jurt/com/sun/star/uno/MappingException.java
index a67ddf9dfd84..b386e4512c70 100644
--- a/jurt/com/sun/star/uno/MappingException.java
+++ b/jurt/com/sun/star/uno/MappingException.java
@@ -33,14 +33,14 @@ package com.sun.star.uno;
  */
 public class MappingException extends com.sun.star.uno.RuntimeException {
 /**
- * 

[Libreoffice-commits] core.git: desktop/source filter/source framework/inc framework/source include/osl include/svtools include/vcl pyuno/source sc/inc scripting/source sc/source sfx2/source svgio/inc

[tymyjan]

 desktop/source/migration/migration_impl.hxx  |2 +-
 filter/source/config/cache/cacheitem.hxx |6 ++
 filter/source/config/cache/querytokenizer.hxx|3 +--
 framework/inc/classes/filtercachedata.hxx|6 ++
 framework/inc/stdtypes.h |3 +--
 framework/inc/uiconfiguration/imagetype.hxx  |6 ++
 framework/inc/uielement/uicommanddescription.hxx |6 ++
 framework/inc/uifactory/factoryconfiguration.hxx |3 +--
 framework/inc/xml/imagesdocumenthandler.hxx  |3 +--
 framework/inc/xml/statusbardocumenthandler.hxx   |3 +--
 framework/source/inc/accelerators/keymapping.hxx |3 +--
 framework/source/uiconfiguration/imagemanagerimpl.hxx|3 +--
 framework/source/uiconfiguration/moduleuicfgsupplier.cxx |2 +-
 include/osl/diagnose.hxx |2 +-
 include/svtools/framestatuslistener.hxx  |3 +--
 include/svtools/statusbarcontroller.hxx  |3 +--
 include/vcl/CommandImageResolver.hxx |2 +-
 pyuno/source/module/pyuno_impl.hxx   |   11 ---
 sc/inc/formulaparserpool.hxx |3 +--
 sc/inc/lookupcache.hxx   |4 ++--
 sc/inc/macromgr.hxx  |2 +-
 sc/source/ui/view/dbfunc3.cxx|2 +-
 scripting/source/dlgprov/dlgevtatt.hxx   |3 +--
 scripting/source/provider/ActiveMSPList.hxx  |2 +-
 scripting/source/provider/ProviderCache.hxx  |3 +--
 sfx2/source/appl/imagemgr.cxx|3 +--
 svgio/inc/svgio/svgreader/svgdocument.hxx|5 ++---
 svx/source/table/propertyset.hxx |2 +-
 sw/source/core/doc/swstylemanager.cxx|3 +--
 unotools/source/config/optionsdlg.cxx|2 +-
 30 files changed, 39 insertions(+), 65 deletions(-)

New commits:
commit bfb9612226314cd037c8eda30cc6ebbb46dc8512
Author: tymyjan 
Date:   Sun Apr 3 15:53:23 2016 +0200

tdf#97499 Fixed containers parameters clearing #3

Change-Id: I1c105de7e1df251533179fba77e3797ef1c4e2d4
Reviewed-on: https://gerrit.libreoffice.org/23752
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/desktop/source/migration/migration_impl.hxx 
b/desktop/source/migration/migration_impl.hxx
index 329414af1..95e63d0 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -135,7 +135,7 @@ struct MigrationItem
 };
 
 typedef std::unordered_map< OUString, std::vector< MigrationItem >,
-OUStringHash, std::equal_to< OUString > > 
MigrationHashMap;
+OUStringHash > MigrationHashMap;
 
 /**
 information for the UI elements to be migrated for one module
diff --git a/filter/source/config/cache/cacheitem.hxx 
b/filter/source/config/cache/cacheitem.hxx
index e890f3a..4e66650 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -150,8 +150,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
  */
 typedef std::unordered_map< OUString,
 CacheItem  ,
-OUStringHash,
-std::equal_to< OUString > > CacheItemList;
+OUStringHash > CacheItemList;
 
 
 /** @short  supports registration of multiple key to
@@ -168,8 +167,7 @@ typedef std::unordered_map< OUString,
  */
 typedef std::unordered_map< OUString,
 OUStringList   ,
-OUStringHash,
-std::equal_to< OUString > > CacheItemRegistration;
+OUStringHash > CacheItemRegistration;
 
 
 /** @short  is used to collect all matching types of an URL
diff --git a/filter/source/config/cache/querytokenizer.hxx 
b/filter/source/config/cache/querytokenizer.hxx
index 9a25efa..42f2574 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -47,8 +47,7 @@ namespace filter{
  */
 class QueryTokenizer : public std::unordered_map< OUString,
   OUString,
-  OUStringHash,
-  std::equal_to< OUString > >
+  OUStringHash >
 {
 
 // member
diff --git 

[Libreoffice-commits] core.git: desktop/source filter/source include/toolkit include/vcl sw/qa toolkit/source vcl/source

[Noel Grandin]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx  |4 ++--
 desktop/source/deployment/gui/dp_gui_dialog2.hxx  |2 +-
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx|8 +++-
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |9 -
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx  |5 +++--
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx  |3 ++-
 include/toolkit/awt/scrollabledialog.hxx  |2 +-
 include/vcl/dialog.hxx|   17 -
 sw/qa/tiledrendering/tiledrendering.cxx   |2 +-
 toolkit/source/awt/scrollabledialog.cxx   |4 ++--
 toolkit/source/awt/vclxtoolkit.cxx|5 +++--
 vcl/source/uipreviewer/previewer.cxx  |2 +-
 vcl/source/window/dialog.cxx  |   18 +-
 13 files changed, 40 insertions(+), 41 deletions(-)

New commits:
commit 39078c247d31674544901f8449f5141185f79f7f
Author: Noel Grandin n...@peralex.com
Date:   Wed May 6 14:07:17 2015 +0200

cleanup DIALOG_NO_PARENT, follow on to tdf#91090

remove the DIALOG_NO_PARENT abomination and replace it with a flags
parameter

Change-Id: I71b7dc46c619f2db56af6d4dc2c17daf0a2c8534
Reviewed-on: https://gerrit.libreoffice.org/15645
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 7978b44..4b3fb8f 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -668,8 +668,8 @@ void DialogHelper::PostUserEvent( const Link rLink, 
void* pCaller )
 }
 
 // ExtMgrDialog
-ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager)
-: ModelessDialog(pParent, ExtensionManagerDialog, 
desktop/ui/extensionmanager.ui)
+ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager 
*pManager, Dialog::InitFlag eFlag)
+: ModelessDialog(pParent, ExtensionManagerDialog, 
desktop/ui/extensionmanager.ui, eFlag)
 , DialogHelper(pManager-getContext(), (Dialog*) this)
 , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
 , m_bHasProgress(false)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 75e52f0..46a0c9e 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -139,7 +139,7 @@ class ExtMgrDialog : public ModelessDialog,
 DECL_DLLPRIVATE_LINK( startProgress, void * );
 
 public:
-ExtMgrDialog( vcl::Window * pParent, TheExtensionManager 
*pManager );
+ExtMgrDialog( vcl::Window * pParent, TheExtensionManager 
*pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
 virtual~ExtMgrDialog();
 virtual voiddispose() SAL_OVERRIDE;
 
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx 
b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index fa42dc2..ccf0b54 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -120,12 +120,10 @@ void TheExtensionManager::createDialog( const bool 
bCreateUpdDlg )
 }
 else if ( !m_pExtMgrDialog )
 {
-// FIXME: horrible ...
-vcl::Window* pParent = DIALOG_NO_PARENT;
 if (m_xParent.is())
-pParent = VCLUnoHelper::GetWindow(m_xParent);
-
-m_pExtMgrDialog = VclPtrExtMgrDialog::Create( pParent, this );
+m_pExtMgrDialog = VclPtrExtMgrDialog::Create( 
VCLUnoHelper::GetWindow(m_xParent), this );
+else
+m_pExtMgrDialog = VclPtrExtMgrDialog::Create( nullptr, this, 
Dialog::InitFlag::NoParent );
 delete m_pExecuteCmdQueue;
 m_pExecuteCmdQueue = new ExtensionCmdQueue( m_pExtMgrDialog.get(), 
this, m_xContext );
 m_pExtMgrDialog-setGetExtensionsURL( m_sGetExtensionsURL );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx 
b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 5d710e5..ef70707 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -326,12 +326,11 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  ) 
throw(RuntimeException,
 
 if( nullptr == mpDialog )
 {
-vcl::Window* pParent = DIALOG_NO_PARENT;
-if (mxParent.is())
-pParent = VCLUnoHelper::GetWindow(mxParent);
-
 Reference XComponent  xComp( this );
-mpDialog = VclPtrXMLFilterSettingsDialog::Create(pParent, mxContext);
+if (mxParent.is())
+mpDialog = 
VclPtrXMLFilterSettingsDialog::Create(VCLUnoHelper::GetWindow(mxParent), 
mxContext);
+else
+   

[Libreoffice-commits] core.git: desktop/source filter/source framework/source

[Tor Lillqvist]

 desktop/source/app/app.cxx |6 --
 desktop/source/app/appinit.cxx |2 +-
 desktop/source/splash/splash.cxx   |3 +--
 filter/source/config/cache/filtercache.cxx |   18 +-
 framework/source/jobs/jobexecutor.cxx  |2 +-
 framework/source/services/desktop.cxx  |3 +--
 6 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit b5008653ec887447fe2a0e6b725710550a606ce7
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Feb 3 12:19:26 2015 +0100

Clean up some weird logging

Change-Id: I8da0a89b7d6e044af8188a87220c654cb7bf9d4d

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2118fcc..562b1f2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1346,9 +1346,7 @@ int Desktop::Main()
 ResMgr::SetReadStringHook( ReplaceStringHookProc );
 
 // Startup screen
-SAL_INFO( desktop.app, desktop (lo119109) Desktop::Main { 
OpenSplashScreen );
 OpenSplashScreen();
-SAL_INFO( desktop.app, desktop (lo119109) Desktop::Main } 
OpenSplashScreen );
 
 SetSplashScreenProgress(10);
 
@@ -1383,7 +1381,6 @@ int Desktop::Main()
 #if HAVE_FEATURE_DESKTOP
 // check user installation directory for lockfile so we can be sure
 // there is no other instance using our data files from a remote host
-SAL_INFO( desktop.app, desktop (lo119109) Desktop::Main - 
Lockfile );
 m_xLockfile.reset(new Lockfile);
 
 if ( !rCmdLineArgs.IsHeadless()  !rCmdLineArgs.IsInvisible() 
@@ -1392,16 +1389,13 @@ int Desktop::Main()
 // Lockfile exists, and user clicked 'no'
 return EXIT_FAILURE;
 }
-SAL_INFO( desktop.app, desktop (lo119109) Desktop::Main - 
Lockfile );
 
 // check if accessibility is enabled but not working and allow to quit
-SAL_INFO( desktop.app, { GetEnableATToolSupport );
 if( 
Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
 {
 if( !InitAccessBridge() )
 return EXIT_FAILURE;
 }
-SAL_INFO( desktop.app, } GetEnableATToolSupport );
 #endif
 
 // terminate if requested...
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 797ea9c..cbfd1a3 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -218,7 +218,7 @@ class enable
 
 void Desktop::enableAcceptors()
 {
-SAL_INFO( desktop.app, desktop (lo119109) Desktop::enableAcceptors);
+SAL_INFO( desktop.app, enableAcceptors);
 if (!bAccept)
 {
 // from now on, all new acceptors are enabled
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index f3163a2..2649c24 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -222,8 +222,7 @@ void SAL_CALL SplashScreen::setText(const OUString rText)
 void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
 throw (RuntimeException, std::exception)
 {
-SAL_INFO( desktop.splash, ::SplashScreen::setValue (lo119109) );
-SAL_INFO( desktop.splash, value=  nValue );
+SAL_INFO( desktop.splash, setValue:   nValue );
 
 SolarMutexGuard aSolarGuard;
 if (_bVisible  !_bProgressEnd) {
diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index 83537b7..c6da21f 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -813,7 +813,7 @@ css::uno::Reference css::uno::XInterface  
FilterCache::impl_openConfig(EConfig
 return m_xConfigTypes;
 sPath   = CFGPACKAGE_TD_TYPES;
 pConfig = m_xConfigTypes;
-sRtlLog = framework (as96863) 
::FilterCache::impl_openconfig(E_PROVIDER_TYPES);
+sRtlLog = impl_openconfig(E_PROVIDER_TYPES);
 }
 break;
 
@@ -823,7 +823,7 @@ css::uno::Reference css::uno::XInterface  
FilterCache::impl_openConfig(EConfig
 return m_xConfigFilters;
 sPath   = CFGPACKAGE_TD_FILTERS;
 pConfig = m_xConfigFilters;
-sRtlLog = framework (as96863) 
::FilterCache::impl_openconfig(E_PROVIDER_FILTERS);
+sRtlLog = impl_openconfig(E_PROVIDER_FILTERS);
 }
 break;
 
@@ -833,7 +833,7 @@ css::uno::Reference css::uno::XInterface  
FilterCache::impl_openConfig(EConfig
 return m_xConfigOthers;
 sPath   = CFGPACKAGE_TD_OTHERS;
 pConfig = m_xConfigOthers;
-sRtlLog = framework (as96863) 
::FilterCache::impl_openconfig(E_PROVIDER_OTHERS);
+sRtlLog = impl_openconfig(E_PROVIDER_OTHERS);
 }
 break;
 
@@ -843,7 +843,7 @@ css::uno::Reference css::uno::XInterface  
FilterCache::impl_openConfig(EConfig
 // the old configuration format only. Its not cached!