2010-10-12 15:53:47 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
re-base on ALv2 code. Includes (at least) relevant parts of:
linecap: Reintegrating finished LineCap feature
Patch contributed by Regina Henschel
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patches contributed by Sven Jacobi
impress212: #i81610# fixed animation export
http://svn.apache.org/viewvc?view=revision&revision=1167620
impress212: drawinglayer gbuild environment changes
http://svn.apache.org/viewvc?view=revision&revision=1167627
http://svn.apache.org/viewvc?view=revision&revision=1167628
impress212: DffPropSet -> minor code improvements, removing table
http://svn.apache.org/viewvc?view=revision&revision=1167634
impress212: #158494# fixed excel import (text rotation)
http://svn.apache.org/viewvc?view=revision&revision=1167638
Patches contributed by Armin Le Grand
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement
http://svn.apache.org/viewvc?view=revision&revision=1220836
#118728# changed indentifying definitions for Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1229961
#118838# LineGeometry creation for complicated cases optimized to
create single Polygons
http://svn.apache.org/viewvc?view=revision&revision=1236232
#119176# corrected file type detection for SVG for svg files
without xml header
http://svn.apache.org/viewvc?view=revision&revision=1309445
#118728# Extended Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1230531
#118529# solve break converters and convert commands for OLEs and images
http://svn.apache.org/viewvc?view=revision&revision=1186168
svg: added WaE changes from branch svgreplacement to trunc
http://svn.apache.org/viewvc?view=revision&revision=1222974
svg: corrected missing member initialization
http://svn.apache.org/viewvc?view=revision&revision=1226134
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert
metafiles to bitmapEx ...
http://svn.apache.org/viewvc?view=revision&revision=1293316
fix for #118525#: removed no longer used variable maOriginalMapMode, one
more exception eliminated
http://svn.apache.org/viewvc?view=revision&revision=1227097
#16758# Added buffering to the VDev usages of the VclProcessor2D derivates...
http://svn.apache.org/viewvc?view=revision&revision=1229521
#116758# Secured VDev buffer device to Vcl deinit
http://svn.apache.org/viewvc?view=revision&revision=1230574
#116758# added remembering allocated VDevs for VDevBuffer to be able to also
delete these when vcl goes down; it should never happen, but You never know
http://svn.apache.org/viewvc?view=revision&revision=1230927
#118730# Changed SvgClipPathNode to use MaskPrimitive2D for primitive
representation instead of TransparencePrimitive2D
http://svn.apache.org/viewvc?view=revision&revision=1231198
#118822# secured 3D geometry creation (slices) by subdividing the 2D
source polyPolygon early
http://svn.apache.org/viewvc?view=revision&revision=1234749
#118829# enhanced Svg gradient quality, obstacles avoided
http://svn.apache.org/viewvc?view=revision&revision=1235361
#118834# Unified usage of TextBreakupHelper as single tooling class
for i18n text primitive breakup
http://svn.apache.org/viewvc?view=revision&revision=1236110
#118853# added square pixel size limit to conversion of
TransparencePrimitive2D to Metafile action
http://svn.apache.org/viewvc?view=revision&revision=1237656
#118824# coreccted mirroring and boundrect when the graphicmanager
is used for bitmap output
http://svn.apache.org/viewvc?view=revision&revision=1240097
#115092# Corrected VclProcessor2D::RenderPolygonStrokePrimitive2D for
various optimization scenarios
http://svn.apache.org/viewvc?view=revision&revision=1241434
#118783# Corrected errors in ID strings, corrected Svg line/fill export,
corrected polygon close state
http://svn.apache.org/viewvc?view=revision&revision=1232006
#118796# corrected null-pointer usage in SVG text exporter
http://svn.apache.org/viewvc?view=revision&revision=1240262
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image
import with linked graphics, too
http://svn.apache.org/viewvc?view=revision&revision=1229962
#118898# corrected error in GDIMetaFile::GetBoundRect in handling
MetaFloatTransparentAction
http://svn.apache.org/viewvc?view=revision&revision=1293349
#118855# Corrected handling of possibly created empty clipRegions
after PolyPolygon clipping
http://svn.apache.org/viewvc?view=revision&revision=1237725
#115962# Better (but not yet optimal, see comments in task) handling
of MetaFloatTransparentAction in PDF export
http://svn.apache.org/viewvc?view=revision&revision=1241078
IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, ...
http://svn.apache.org/viewvc?view=revision&revision=1200879
118779# Added svg content streaming in/out to ImpGraphic stream operators
http://svn.apache.org/viewvc?view=revision&revision=1231908
linecap: correctons for WaE and mac drawing
http://svn.apache.org/viewvc?view=revision&revision=1232793
svg: uses current system Dpi for Svg replacement image creation
http://svn.apache.org/viewvc?view=revision&revision=1233948
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1394326
Remove duplicate header includes.
cws mba34issues01: #i117720#: convert assertion into warning
http://svn.apache.org/viewvc?view=revision&revision=1172352
118485 - Styles for OLEs are not saved. Submitted by Armin Le Grand.
http://svn.apache.org/viewvc?view=revision&revision=1182166
cws mba34issues01: #i117714#: remove assertion
http://svn.apache.org/viewvc?view=revision&revision=1172357
Patch contributed by Jurgen Schmidt
add some additional checks to ensure proper reading operations
http://svn.apache.org/viewvc?view=revision&revision=1209022
mostly prefer our stream / bounds checking work.
Patches contributed by Herbert Duerr
#i118816# add clarifying comment regarding Font::*Color*() methods
http://svn.apache.org/viewvc?view=revision&revision=1233833
extend macro->string handling for empty strings
http://svn.apache.org/viewvc?view=revision&revision=1175801
avoid magic constants for SALCOLOR_NONE
http://svn.apache.org/viewvc?view=revision&revision=1177543
initialize slant properly in ImplFontMetricData constructor (author=iorsh)
http://svn.apache.org/viewvc?view=revision&revision=1177551
#i118675# make check for extension updates more stable
http://svn.apache.org/viewvc?view=revision&revision=1214797
#a118617# remove VBasicEventListener.dll binary
There are no known users depending on its CLSID
http://svn.apache.org/viewvc?view=revision&revision=1203697
Patches contributed by Ariel Constenla-Haile
Fix build breaker on Linux/gcc
http://svn.apache.org/viewvc?view=revision&revision=1221104
Fix crash when trying to instantiate css.graphic.GraphicRasterizer_RSVG
http://svn.apache.org/viewvc?view=revision&revision=1215559
Patches contributed by Oliver-Rainer Wittmann
sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider
instances of <SwFlyDrawObj>
http://svn.apache.org/viewvc?view=revision&revision=1172120
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
gnumake4 work variously from Hans-Joachim Lankenau
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1396782
http://svn.apache.org/viewvc?view=revision&revision=1394707
plus some amount of re-splitting of legacy headers.
Patch contributed by Pavel Janik
WaE: Remove unused variables.
http://svn.apache.org/viewvc?view=revision&revision=1230697
Patches contributed by Takashi Ono
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
Patch contributed by Christian Lippka
impress212: #i98044# re enable Text menu for outline and title shapes
http://svn.apache.org/viewvc?view=revision&revision=1167639
Patch contributed by Andre Fischer
118674: Made category B code optional and disabled by default.
http://svn.apache.org/viewvc?view=revision&revision=1215131
118881: Ignore empty paragraphs after bullets.
http://svn.apache.org/viewvc?view=revision&revision=1296205
Patches contributed by Philipp Lohmann
ooo340fixes: #i117780# use rtl allocator
http://svn.apache.org/viewvc?view=revision&revision=1172087
ooo34gsl02: #i117807# fix an off by one error (index actually
inside the pfb section header)
http://svn.apache.org/viewvc?view=revision&revision=1167576
various cleanups, related compilation fixes, warning cleanups, re-working
of obsolete stl template pieces to use boost instead, changed string
classes, re-adapt KDE about data, about dialog, fixing warnings,
and other fixes & improvements.
Disable svg import / render for about/ branding code-paths for now.
Restore full icon theme set.
Remove OS/2 conditionals and sources.
Remove conflicting gtk/full-screen monitors support.
Retain existing svg rasterizer files - temporarily disabled.
Standardize stringificaiton and fixup dllpostfix issues.
Rename SvgGradientHelper::== to equalTo to avoid overloading issues.
Use the flat GdiPlus API for LineCaps calls.
2012-10-09 12:22:23 +01:00
|
|
|
/*
|
|
|
|
* This file is part of the LibreOffice project.
|
|
|
|
*
|
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
*
|
|
|
|
* This file incorporates work covered by the following license notice:
|
|
|
|
*
|
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
|
|
* with this work for additional information regarding copyright
|
|
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
|
|
* except in compliance with the License. You may obtain a copy of
|
|
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
|
|
*/
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2017-02-06 17:08:38 +01:00
|
|
|
#include <sal/config.h>
|
|
|
|
|
2019-12-18 21:37:52 +01:00
|
|
|
#include <com/sun/star/awt/FontDescriptor.hpp>
|
|
|
|
#include <com/sun/star/beans/PropertyValue.hpp>
|
|
|
|
#include <com/sun/star/lang/IllegalArgumentException.hpp>
|
2017-02-06 17:08:38 +01:00
|
|
|
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
|
2006-05-02 14:36:05 +00:00
|
|
|
#include <com/sun/star/text/HoriOrientation.hpp>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include <com/sun/star/awt/XBitmap.hpp>
|
2018-02-21 20:15:21 +09:00
|
|
|
#include <com/sun/star/graphic/XGraphic.hpp>
|
2014-01-31 04:53:17 -02:00
|
|
|
#include <cppuhelper/supportsservice.hxx>
|
2019-12-18 21:37:52 +01:00
|
|
|
#include <cppuhelper/implbase1.hxx>
|
2019-04-19 14:38:04 +02:00
|
|
|
#include <vcl/font.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include <vcl/svapp.hxx>
|
|
|
|
#include <vcl/graph.hxx>
|
2018-03-11 11:16:34 +09:00
|
|
|
#include <vcl/GraphicObject.hxx>
|
2018-04-25 23:45:22 +09:00
|
|
|
#include <vcl/GraphicLoader.hxx>
|
2018-12-26 01:11:42 +01:00
|
|
|
#include <tools/debug.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2013-02-12 13:41:53 -05:00
|
|
|
#include <editeng/brushitem.hxx>
|
2010-01-06 19:26:54 +01:00
|
|
|
#include <editeng/unoprnms.hxx>
|
|
|
|
#include <editeng/numitem.hxx>
|
|
|
|
#include <editeng/unofdesc.hxx>
|
|
|
|
#include <editeng/unonrule.hxx>
|
|
|
|
#include <editeng/editids.hrc>
|
2013-04-10 20:41:54 +02:00
|
|
|
#include <editeng/numdef.hxx>
|
2017-03-07 11:19:35 +02:00
|
|
|
#include <o3tl/enumarray.hxx>
|
2021-01-07 16:42:41 +01:00
|
|
|
#include <o3tl/temporary.hxx>
|
2015-06-15 17:58:15 +09:00
|
|
|
#include <memory>
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
using ::com::sun::star::util::XCloneable;
|
|
|
|
using ::com::sun::star::ucb::XAnyCompare;
|
|
|
|
|
|
|
|
|
2000-12-01 15:48:42 +00:00
|
|
|
using namespace ::std;
|
2008-06-06 11:36:07 +00:00
|
|
|
using namespace ::com::sun::star;
|
|
|
|
using namespace ::com::sun::star::uno;
|
|
|
|
using namespace ::com::sun::star::lang;
|
|
|
|
using namespace ::com::sun::star::container;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2006-05-02 14:36:05 +00:00
|
|
|
const SvxAdjust aUnoToSvxAdjust[] =
|
|
|
|
{
|
2017-03-07 11:19:35 +02:00
|
|
|
SvxAdjust::Left,
|
|
|
|
SvxAdjust::Right,
|
|
|
|
SvxAdjust::Center,
|
|
|
|
SvxAdjust::Left,
|
|
|
|
SvxAdjust::Left,
|
|
|
|
SvxAdjust::Left,
|
|
|
|
SvxAdjust::Block
|
2006-05-02 14:36:05 +00:00
|
|
|
};
|
|
|
|
|
2017-03-07 11:19:35 +02:00
|
|
|
const o3tl::enumarray<SvxAdjust, unsigned short> aSvxToUnoAdjust
|
2006-05-02 14:36:05 +00:00
|
|
|
{
|
|
|
|
text::HoriOrientation::LEFT,
|
|
|
|
text::HoriOrientation::RIGHT,
|
|
|
|
text::HoriOrientation::FULL,
|
|
|
|
text::HoriOrientation::CENTER,
|
|
|
|
text::HoriOrientation::FULL,
|
|
|
|
text::HoriOrientation::LEFT
|
|
|
|
};
|
|
|
|
|
2018-09-15 19:13:19 +02:00
|
|
|
static SvxAdjust ConvertUnoAdjust( unsigned short nAdjust )
|
2006-05-02 14:36:05 +00:00
|
|
|
{
|
2017-05-19 19:55:00 +02:00
|
|
|
DBG_ASSERT( nAdjust <= 7, "Enum has changed! [CL]" );
|
2006-05-02 14:36:05 +00:00
|
|
|
return aUnoToSvxAdjust[nAdjust];
|
|
|
|
}
|
|
|
|
|
2018-09-15 19:13:19 +02:00
|
|
|
static unsigned short ConvertUnoAdjust( SvxAdjust eAdjust )
|
2006-05-02 14:36:05 +00:00
|
|
|
{
|
2018-01-15 09:06:01 +01:00
|
|
|
DBG_ASSERT( static_cast<int>(eAdjust) <= 6, "Enum has changed! [CL]" );
|
2006-05-02 14:36:05 +00:00
|
|
|
return aSvxToUnoAdjust[eAdjust];
|
|
|
|
}
|
|
|
|
|
2000-12-01 15:48:42 +00:00
|
|
|
UNO3_GETIMPLEMENTATION_IMPL( SvxUnoNumberingRules );
|
|
|
|
|
2017-12-22 10:50:40 +00:00
|
|
|
SvxUnoNumberingRules::SvxUnoNumberingRules(const SvxNumRule& rRule)
|
2000-12-01 15:48:42 +00:00
|
|
|
: maRule( rRule )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2021-04-30 08:20:03 +02:00
|
|
|
SvxUnoNumberingRules::~SvxUnoNumberingRules() noexcept
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
//XIndexReplace
|
|
|
|
void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno::Any& Element )
|
|
|
|
{
|
2010-10-13 02:47:36 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2000-12-01 15:48:42 +00:00
|
|
|
if( Index < 0 || Index >= maRule.GetLevelCount() )
|
2008-06-06 11:36:07 +00:00
|
|
|
throw IndexOutOfBoundsException();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
Sequence< beans::PropertyValue > aSeq;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
if( !( Element >>= aSeq) )
|
2008-06-06 11:36:07 +00:00
|
|
|
throw IllegalArgumentException();
|
2000-09-18 16:07:07 +00:00
|
|
|
setNumberingRuleByIndex( aSeq, Index );
|
|
|
|
}
|
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
// XIndexAccess
|
2017-01-26 12:28:58 +01:00
|
|
|
sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount()
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2010-10-13 02:47:36 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
return maRule.GetLevelCount();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2010-10-13 02:47:36 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2000-12-01 15:48:42 +00:00
|
|
|
if( Index < 0 || Index >= maRule.GetLevelCount() )
|
2008-06-06 11:36:07 +00:00
|
|
|
throw IndexOutOfBoundsException();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
return Any( getNumberingRuleByIndex(Index) );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//XElementAccess
|
2008-06-06 11:36:07 +00:00
|
|
|
Type SAL_CALL SvxUnoNumberingRules::getElementType()
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2015-04-01 08:38:49 +02:00
|
|
|
return cppu::UnoType<Sequence< beans::PropertyValue >>::get();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2017-01-26 12:28:58 +01:00
|
|
|
sal_Bool SAL_CALL SvxUnoNumberingRules::hasElements()
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2016-04-20 17:16:37 +02:00
|
|
|
return true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
// XAnyCompare
|
2017-01-26 12:28:58 +01:00
|
|
|
sal_Int16 SAL_CALL SvxUnoNumberingRules::compare( const Any& rAny1, const Any& rAny2 )
|
2008-06-06 11:36:07 +00:00
|
|
|
{
|
|
|
|
return SvxUnoNumberingRules::Compare( rAny1, rAny2 );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XCloneable
|
2017-01-26 12:28:58 +01:00
|
|
|
Reference< XCloneable > SAL_CALL SvxUnoNumberingRules::createClone( )
|
2008-06-06 11:36:07 +00:00
|
|
|
{
|
|
|
|
return new SvxUnoNumberingRules(maRule);
|
|
|
|
}
|
|
|
|
|
2017-01-26 12:28:58 +01:00
|
|
|
OUString SAL_CALL SvxUnoNumberingRules::getImplementationName( )
|
2000-12-19 13:15:47 +00:00
|
|
|
{
|
2019-07-30 17:56:02 +02:00
|
|
|
return "SvxUnoNumberingRules";
|
2000-12-19 13:15:47 +00:00
|
|
|
}
|
|
|
|
|
2017-01-26 12:28:58 +01:00
|
|
|
sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName )
|
2000-12-19 13:15:47 +00:00
|
|
|
{
|
2014-01-31 04:53:17 -02:00
|
|
|
return cppu::supportsService(this, ServiceName);
|
2000-12-19 13:15:47 +00:00
|
|
|
}
|
|
|
|
|
2017-01-26 12:28:58 +01:00
|
|
|
Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( )
|
2000-12-19 13:15:47 +00:00
|
|
|
{
|
2019-08-17 11:39:47 +02:00
|
|
|
return { "com.sun.star.text.NumberingRules" };
|
2000-12-19 13:15:47 +00:00
|
|
|
}
|
|
|
|
|
2014-05-28 13:08:21 +01:00
|
|
|
Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal_Int32 nIndex) const
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
// NumberingRule aRule;
|
2018-01-12 20:25:09 +01:00
|
|
|
const SvxNumberFormat& rFmt = maRule.GetLevel(static_cast<sal_uInt16>(nIndex));
|
2000-09-18 16:07:07 +00:00
|
|
|
sal_uInt16 nIdx = 0;
|
|
|
|
|
2000-12-01 15:48:42 +00:00
|
|
|
const int nProps = 15;
|
2015-06-15 17:58:15 +09:00
|
|
|
std::unique_ptr<beans::PropertyValue[]> pArray(new beans::PropertyValue[nProps]);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
Any aVal;
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2018-01-12 20:25:09 +01:00
|
|
|
aVal <<= static_cast<sal_uInt16>(rFmt.GetNumberingType());
|
2017-01-30 16:38:54 +02:00
|
|
|
beans::PropertyValue aAlignProp( UNO_NAME_NRULE_NUMBERINGTYPE, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
pArray[nIdx++] = aAlignProp;
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
SvxAdjust eAdj = rFmt.GetNumAdjust();
|
|
|
|
aVal <<= ConvertUnoAdjust(eAdj);
|
2017-01-30 16:38:54 +02:00
|
|
|
pArray[nIdx++] = beans::PropertyValue( UNO_NAME_NRULE_ADJUST, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2017-03-03 16:01:45 +02:00
|
|
|
aVal <<= rFmt.GetPrefix();
|
2017-01-30 16:38:54 +02:00
|
|
|
beans::PropertyValue aPrefixProp( UNO_NAME_NRULE_PREFIX, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
pArray[nIdx++] = aPrefixProp;
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2017-03-03 16:01:45 +02:00
|
|
|
aVal <<= rFmt.GetSuffix();
|
2017-01-30 16:38:54 +02:00
|
|
|
beans::PropertyValue aSuffixProp( UNO_NAME_NRULE_SUFFIX, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
pArray[nIdx++] = aSuffixProp;
|
|
|
|
}
|
|
|
|
|
2013-11-26 14:25:22 +00:00
|
|
|
if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
|
2000-11-02 14:37:23 +00:00
|
|
|
{
|
2020-09-22 10:34:21 +01:00
|
|
|
sal_UCS4 nCode = rFmt.GetBulletChar();
|
2000-11-02 14:37:23 +00:00
|
|
|
OUString aStr( &nCode, 1 );
|
|
|
|
aVal <<= aStr;
|
2017-01-30 16:38:54 +02:00
|
|
|
beans::PropertyValue aBulletProp( "BulletChar", -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-11-02 14:37:23 +00:00
|
|
|
pArray[nIdx++] = aBulletProp;
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
if( rFmt.GetBulletFont() )
|
|
|
|
{
|
|
|
|
awt::FontDescriptor aDesc;
|
|
|
|
SvxUnoFontDescriptor::ConvertFromFont( *rFmt.GetBulletFont(), aDesc );
|
2016-05-30 15:14:03 +02:00
|
|
|
aVal <<= aDesc;
|
2017-01-30 16:38:54 +02:00
|
|
|
pArray[nIdx++] = beans::PropertyValue( UNO_NAME_NRULE_BULLET_FONT, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const SvxBrushItem* pBrush = rFmt.GetBrush();
|
2018-02-17 18:10:11 +09:00
|
|
|
const Graphic* pGraphic = nullptr;
|
|
|
|
if (pBrush)
|
|
|
|
pGraphic = pBrush->GetGraphic();
|
|
|
|
if (pGraphic)
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2018-02-21 20:15:21 +09:00
|
|
|
uno::Reference<awt::XBitmap> xBitmap(pGraphic->GetXGraphic(), uno::UNO_QUERY);
|
2018-02-17 18:10:11 +09:00
|
|
|
aVal <<= xBitmap;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2018-02-17 18:10:11 +09:00
|
|
|
const beans::PropertyValue aGraphicProp("GraphicBitmap", -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
pArray[nIdx++] = aGraphicProp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const Size aSize( rFmt.GetGraphicSize() );
|
|
|
|
const awt::Size aUnoSize( aSize.Width(), aSize.Height() );
|
|
|
|
aVal <<= aUnoSize;
|
2017-01-30 16:38:54 +02:00
|
|
|
const beans::PropertyValue aGraphicSizeProp("GraphicSize", -1, aVal, beans::PropertyState_DIRECT_VALUE );
|
2000-09-18 16:07:07 +00:00
|
|
|
pArray[nIdx++] = aGraphicSizeProp;
|
|
|
|
}
|
|
|
|
|
2018-01-12 20:25:09 +01:00
|
|
|
aVal <<= static_cast<sal_Int16>(rFmt.GetStart());
|
2017-01-30 16:38:54 +02:00
|
|
|
pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_START_WITH, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
SvxNumberFormat::nAbsLSpace should have a larger type
...as is seen when executing CppunitTest_sd_filters_test with Clang's new
-fsanitize=implicit-conversion (see below). The next larger natural choice
after short is sal_Int32, and some of the code calling GetAbsLSpace actually
already supported the value to be as wide (but not wider than) sal_Int32; code
calling GetAbsLSpace that expected the value to be no wider than short has
either been adapted or at least been marked with a TODO. (Other choices could
have been sal_Int64 or long.)
Some dependent function's parameter types have also been changed accordingly.
> Testing file:///home/sbergman/lo/core/sd/qa/unit/data/ppt/pass/hang-10.ppt:
[...]
> filter/source/msfilter/svdfppt.cxx:3792:33: runtime error: implicit conversion from type 'sal_uInt32' (aka 'unsigned int') of value 144780 (32-bit, unsigned) to type 'short' changed the value to 13708 (16-bit, signed)
> #0 in PPTNumberFormatCreator::ImplGetNumberFormat(SdrPowerPointImport const&, SvxNumberFormat&) at filter/source/msfilter/svdfppt.cxx:3792:33 (instdir/program/libmsfilterlo.so +0x7992cc)
> #1 in PPTNumberFormatCreator::GetNumberFormat(SdrPowerPointImport const&, SvxNumberFormat&, unsigned int, PPTParaLevel const&, PPTCharLevel const&, TSS_Type) at filter/source/msfilter/svdfppt.cxx:3674:5 (instdir/program/libmsfilterlo.so +0x797c6d)
> #2 in PPTStyleSheet::PPTStyleSheet(DffRecordHeader const&, SvStream&, SdrPowerPointImport&, PPTTextParagraphStyleAtomInterpreter const&, PPTTextSpecInfo const&) at filter/source/msfilter/svdfppt.cxx:4395:13 (instdir/program/libmsfilterlo.so +0x7ac38d)
> #3 in SdrPowerPointImport::SdrPowerPointImport(PowerPointImportParam&, rtl::OUString const&) at filter/source/msfilter/svdfppt.cxx:1618:59 (instdir/program/libmsfilterlo.so +0x74762f)
> #4 in ImplSdPPTImport::ImplSdPPTImport(SdDrawDocument*, SotStorage&, SfxMedium&, PowerPointImportParam&) at sd/source/filter/ppt/pptin.cxx:175:7 (instdir/program/libsdfiltlo.so +0x5f2be8)
> #5 in SdPPTImport::SdPPTImport(SdDrawDocument*, SvStream&, SotStorage&, SfxMedium&) at sd/source/filter/ppt/pptin.cxx:162:23 (instdir/program/libsdfiltlo.so +0x5ce2bb)
> #6 in ImportPPT at sd/source/filter/ppt/pptin.cxx:2760:47 (instdir/program/libsdfiltlo.so +0x617c79)
> #7 in SdPPTFilter::Import() at sd/source/filter/sdpptwrp.cxx:106:32 (instdir/program/libsdlo.so +0x2878413)
> #8 in sd::DrawDocShell::ConvertFrom(SfxMedium&) at sd/source/ui/docshell/docshel4.cxx:474:46 (instdir/program/libsdlo.so +0x2e165bc)
> #9 in SfxObjectShell::DoLoad(SfxMedium*) at sfx2/source/doc/objstor.cxx:786:23 (instdir/program/libsfxlo.so +0x2c8cb12)
> #10 in SdFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) at sd/qa/unit/filters-test.cxx:75:31 (workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19771)
> #11 in test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:130:20 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x5724c)
> #12 in test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:155:5 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x57ec9)
> #13 in SdFiltersTest::testCVEs() at sd/qa/unit/filters-test.cxx:83:5 (workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19d6d)
Change-Id: Ifa298a51bb62b7cbee9249b8289963f3427721f5
Reviewed-on: https://gerrit.libreoffice.org/59116
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-08-15 16:48:09 +02:00
|
|
|
aVal <<= rFmt.GetAbsLSpace();
|
2017-01-30 16:38:54 +02:00
|
|
|
pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_LEFT_MARGIN, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
SvxNumberFormat::nFirstLineOffset should have a larger type
...similar to 0d227c96e11d7d03829144183bc66d229e059a4b
"SvxNumberFormat::nAbsLSpace should have a larger type", this time due to:
> Testing file:///home/sbergman/lo/core/sd/qa/unit/data/ppt/pass/hang-10.ppt:
[...]
> filter/source/msfilter/svdfppt.cxx:3793:39: runtime error: implicit conversion from type 'sal_Int32' (aka 'int') of value -142240 (32-bit, signed) to type 'short' changed the value to -11168 (16-bit, signed)
> #0 in PPTNumberFormatCreator::ImplGetNumberFormat(SdrPowerPointImport const&, SvxNumberFormat&) at filter/source/msfilter/svdfppt.cxx:3793:39 (instdir/program/libmsfilterlo.so +0x79930d)
> #1 in PPTNumberFormatCreator::GetNumberFormat(SdrPowerPointImport const&, SvxNumberFormat&, unsigned int, PPTParaLevel const&, PPTCharLevel const&, TSS_Type) at filter/source/msfilter/svdfppt.cxx:3674:5 (instdir/program/libmsfilterlo.so +0x797bad)
> #2 in PPTStyleSheet::PPTStyleSheet(DffRecordHeader const&, SvStream&, SdrPowerPointImport&, PPTTextParagraphStyleAtomInterpreter const&, PPTTextSpecInfo const&) at filter/source/msfilter/svdfppt.cxx:4395:13 (instdir/program/libmsfilterlo.so +0x7ac27d)
> #3 in SdrPowerPointImport::SdrPowerPointImport(PowerPointImportParam&, rtl::OUString const&) at filter/source/msfilter/svdfppt.cxx:1618:59 (instdir/program/libmsfilterlo.so +0x74759f)
> #4 in ImplSdPPTImport::ImplSdPPTImport(SdDrawDocument*, SotStorage&, SfxMedium&, PowerPointImportParam&) at sd/source/filter/ppt/pptin.cxx:175:7 (instdir/program/libsdfiltlo.so +0x5f2be8)
> #5 in SdPPTImport::SdPPTImport(SdDrawDocument*, SvStream&, SotStorage&, SfxMedium&) at sd/source/filter/ppt/pptin.cxx:162:23 (instdir/program/libsdfiltlo.so +0x5ce2bb)
> #6 in ImportPPT at sd/source/filter/ppt/pptin.cxx:2760:47 (instdir/program/libsdfiltlo.so +0x617c79)
> #7 in SdPPTFilter::Import() at sd/source/filter/sdpptwrp.cxx:106:32 (instdir/program/libsdlo.so +0x2878233)
> #8 in sd::DrawDocShell::ConvertFrom(SfxMedium&) at sd/source/ui/docshell/docshel4.cxx:474:46 (instdir/program/libsdlo.so +0x2e163dc)
> #9 in SfxObjectShell::DoLoad(SfxMedium*) at sfx2/source/doc/objstor.cxx:786:23 (instdir/program/libsfxlo.so +0x2c8c492)
> #10 in SdFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) at sd/qa/unit/filters-test.cxx:75:31 (workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19771)
> #11 in test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:130:20 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x5724c)
> #12 in test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:155:5 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x57ec9)
> #13 in SdFiltersTest::testCVEs() at sd/qa/unit/filters-test.cxx:83:5 (workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19d6d)
Change-Id: Icd83120e99ac8e7181d75e2cf9d13f49064e65e1
Reviewed-on: https://gerrit.libreoffice.org/59212
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-08-16 18:06:22 +02:00
|
|
|
aVal <<= rFmt.GetFirstLineOffset();
|
2017-01-30 16:38:54 +02:00
|
|
|
pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_FIRST_LINE_OFFSET, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2017-01-30 16:38:54 +02:00
|
|
|
pArray[nIdx++] = beans::PropertyValue("SymbolTextDistance", -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-12-01 15:48:42 +00:00
|
|
|
|
2018-03-07 08:42:58 +02:00
|
|
|
aVal <<= rFmt.GetBulletColor();
|
2017-01-30 16:38:54 +02:00
|
|
|
pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_BULLET_COLOR, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2018-01-12 20:25:09 +01:00
|
|
|
aVal <<= static_cast<sal_Int16>(rFmt.GetBulletRelSize());
|
2017-01-30 16:38:54 +02:00
|
|
|
pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_BULLET_RELSIZE, -1, aVal, beans::PropertyState_DIRECT_VALUE);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-02-16 16:34:02 -05:00
|
|
|
DBG_ASSERT( nIdx <= nProps, "FixMe: overflow in Array!!! [CL]" );
|
2014-03-30 03:38:11 +09:00
|
|
|
Sequence< beans::PropertyValue> aSeq(pArray.get(), nIdx);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
return aSeq;
|
|
|
|
}
|
|
|
|
|
2014-10-17 09:30:25 +01:00
|
|
|
void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::PropertyValue >& rProperties, sal_Int32 nIndex)
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2018-01-12 20:25:09 +01:00
|
|
|
SvxNumberFormat aFmt(maRule.GetLevel( static_cast<sal_uInt16>(nIndex) ));
|
2020-05-20 08:48:56 +02:00
|
|
|
for(const beans::PropertyValue& rProp : rProperties)
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
const OUString& rPropName = rProp.Name;
|
2008-06-06 11:36:07 +00:00
|
|
|
const Any& aVal = rProp.Value;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2012-04-06 15:05:52 +02:00
|
|
|
if ( rPropName == UNO_NAME_NRULE_NUMBERINGTYPE )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-10-12 12:26:00 +00:00
|
|
|
sal_Int16 nSet = sal_Int16();
|
2000-09-18 16:07:07 +00:00
|
|
|
aVal >>= nSet;
|
|
|
|
|
2012-06-08 10:36:51 +00:00
|
|
|
// There is no reason to limit numbering types.
|
|
|
|
if ( nSet>=0 )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2018-01-15 09:06:01 +01:00
|
|
|
aFmt.SetNumberingType(static_cast<SvxNumType>(nSet));
|
2000-09-18 16:07:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_PREFIX )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
OUString aPrefix;
|
|
|
|
if( aVal >>= aPrefix )
|
|
|
|
{
|
|
|
|
aFmt.SetPrefix(aPrefix);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_SUFFIX )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
OUString aSuffix;
|
|
|
|
if( aVal >>= aSuffix )
|
|
|
|
{
|
|
|
|
aFmt.SetSuffix(aSuffix);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_BULLETID )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-10-12 12:26:00 +00:00
|
|
|
sal_Int16 nSet = sal_Int16();
|
2000-09-18 16:07:07 +00:00
|
|
|
if( aVal >>= nSet )
|
|
|
|
{
|
|
|
|
if(nSet < 0x100)
|
|
|
|
{
|
|
|
|
aFmt.SetBulletChar(nSet);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == "BulletChar" )
|
2000-11-02 14:37:23 +00:00
|
|
|
{
|
|
|
|
OUString aStr;
|
|
|
|
if( aVal >>= aStr )
|
|
|
|
{
|
2011-12-23 10:25:18 -02:00
|
|
|
if(!aStr.isEmpty())
|
2000-11-02 14:37:23 +00:00
|
|
|
{
|
2021-01-07 16:42:41 +01:00
|
|
|
aFmt.SetBulletChar(aStr.iterateCodePoints(&o3tl::temporary(sal_Int32(0))));
|
2000-11-02 14:37:23 +00:00
|
|
|
}
|
2001-06-29 11:17:00 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
aFmt.SetBulletChar(0);
|
|
|
|
}
|
|
|
|
continue;
|
2000-11-02 14:37:23 +00:00
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_ADJUST )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-10-12 12:26:00 +00:00
|
|
|
sal_Int16 nAdjust = sal_Int16();
|
2000-09-18 16:07:07 +00:00
|
|
|
if( aVal >>= nAdjust )
|
|
|
|
{
|
2018-01-12 20:25:09 +01:00
|
|
|
aFmt.SetNumAdjust(ConvertUnoAdjust( static_cast<unsigned short>(nAdjust) ));
|
2000-09-18 16:07:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_BULLET_FONT )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
awt::FontDescriptor aDesc;
|
|
|
|
if( aVal >>= aDesc )
|
|
|
|
{
|
2014-09-16 10:09:58 +02:00
|
|
|
vcl::Font aFont;
|
2000-09-18 16:07:07 +00:00
|
|
|
SvxUnoFontDescriptor::ConvertToFont( aDesc, aFont );
|
|
|
|
aFmt.SetBulletFont(&aFont);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2018-04-25 23:45:22 +09:00
|
|
|
else if ( rPropName == "GraphicURL" )
|
|
|
|
{
|
|
|
|
OUString aURL;
|
|
|
|
if (aVal >>= aURL)
|
|
|
|
{
|
|
|
|
Graphic aGraphic = vcl::graphic::loadFromURL(aURL);
|
2019-04-29 15:50:02 +02:00
|
|
|
if (!aGraphic.IsNone())
|
2018-04-25 23:45:22 +09:00
|
|
|
{
|
|
|
|
SvxBrushItem aBrushItem(aGraphic, GPOS_AREA, SID_ATTR_BRUSH);
|
|
|
|
aFmt.SetGraphicBrush(&aBrushItem);
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2018-02-21 20:15:21 +09:00
|
|
|
else if ( rPropName == "GraphicBitmap" )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2018-02-21 20:15:21 +09:00
|
|
|
uno::Reference<awt::XBitmap> xBitmap;
|
2018-04-25 23:45:22 +09:00
|
|
|
if (aVal >>= xBitmap)
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2018-02-21 20:15:21 +09:00
|
|
|
uno::Reference<graphic::XGraphic> xGraphic(xBitmap, uno::UNO_QUERY);
|
|
|
|
Graphic aGraphic(xGraphic);
|
|
|
|
SvxBrushItem aBrushItem(aGraphic, GPOS_AREA, SID_ATTR_BRUSH);
|
2000-09-18 16:07:07 +00:00
|
|
|
aFmt.SetGraphicBrush( &aBrushItem );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == "GraphicSize" )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
awt::Size aUnoSize;
|
|
|
|
if( aVal >>= aUnoSize )
|
|
|
|
{
|
|
|
|
aFmt.SetGraphicSize( Size( aUnoSize.Width, aUnoSize.Height ) );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_START_WITH )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-10-12 12:26:00 +00:00
|
|
|
sal_Int16 nStart = sal_Int16();
|
2000-09-18 16:07:07 +00:00
|
|
|
if( aVal >>= nStart )
|
|
|
|
{
|
|
|
|
aFmt.SetStart( nStart );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_LEFT_MARGIN )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-11-21 16:13:44 +00:00
|
|
|
sal_Int32 nMargin = 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( aVal >>= nMargin )
|
|
|
|
{
|
2018-01-31 08:43:27 +01:00
|
|
|
aFmt.SetAbsLSpace(nMargin);
|
2000-09-18 16:07:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_FIRST_LINE_OFFSET )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-11-21 16:13:44 +00:00
|
|
|
sal_Int32 nMargin = 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( aVal >>= nMargin )
|
|
|
|
{
|
SvxNumberFormat::nFirstLineOffset should have a larger type
...similar to 0d227c96e11d7d03829144183bc66d229e059a4b
"SvxNumberFormat::nAbsLSpace should have a larger type", this time due to:
> Testing file:///home/sbergman/lo/core/sd/qa/unit/data/ppt/pass/hang-10.ppt:
[...]
> filter/source/msfilter/svdfppt.cxx:3793:39: runtime error: implicit conversion from type 'sal_Int32' (aka 'int') of value -142240 (32-bit, signed) to type 'short' changed the value to -11168 (16-bit, signed)
> #0 in PPTNumberFormatCreator::ImplGetNumberFormat(SdrPowerPointImport const&, SvxNumberFormat&) at filter/source/msfilter/svdfppt.cxx:3793:39 (instdir/program/libmsfilterlo.so +0x79930d)
> #1 in PPTNumberFormatCreator::GetNumberFormat(SdrPowerPointImport const&, SvxNumberFormat&, unsigned int, PPTParaLevel const&, PPTCharLevel const&, TSS_Type) at filter/source/msfilter/svdfppt.cxx:3674:5 (instdir/program/libmsfilterlo.so +0x797bad)
> #2 in PPTStyleSheet::PPTStyleSheet(DffRecordHeader const&, SvStream&, SdrPowerPointImport&, PPTTextParagraphStyleAtomInterpreter const&, PPTTextSpecInfo const&) at filter/source/msfilter/svdfppt.cxx:4395:13 (instdir/program/libmsfilterlo.so +0x7ac27d)
> #3 in SdrPowerPointImport::SdrPowerPointImport(PowerPointImportParam&, rtl::OUString const&) at filter/source/msfilter/svdfppt.cxx:1618:59 (instdir/program/libmsfilterlo.so +0x74759f)
> #4 in ImplSdPPTImport::ImplSdPPTImport(SdDrawDocument*, SotStorage&, SfxMedium&, PowerPointImportParam&) at sd/source/filter/ppt/pptin.cxx:175:7 (instdir/program/libsdfiltlo.so +0x5f2be8)
> #5 in SdPPTImport::SdPPTImport(SdDrawDocument*, SvStream&, SotStorage&, SfxMedium&) at sd/source/filter/ppt/pptin.cxx:162:23 (instdir/program/libsdfiltlo.so +0x5ce2bb)
> #6 in ImportPPT at sd/source/filter/ppt/pptin.cxx:2760:47 (instdir/program/libsdfiltlo.so +0x617c79)
> #7 in SdPPTFilter::Import() at sd/source/filter/sdpptwrp.cxx:106:32 (instdir/program/libsdlo.so +0x2878233)
> #8 in sd::DrawDocShell::ConvertFrom(SfxMedium&) at sd/source/ui/docshell/docshel4.cxx:474:46 (instdir/program/libsdlo.so +0x2e163dc)
> #9 in SfxObjectShell::DoLoad(SfxMedium*) at sfx2/source/doc/objstor.cxx:786:23 (instdir/program/libsfxlo.so +0x2c8c492)
> #10 in SdFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) at sd/qa/unit/filters-test.cxx:75:31 (workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19771)
> #11 in test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:130:20 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x5724c)
> #12 in test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:155:5 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x57ec9)
> #13 in SdFiltersTest::testCVEs() at sd/qa/unit/filters-test.cxx:83:5 (workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19d6d)
Change-Id: Icd83120e99ac8e7181d75e2cf9d13f49064e65e1
Reviewed-on: https://gerrit.libreoffice.org/59212
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-08-16 18:06:22 +02:00
|
|
|
aFmt.SetFirstLineOffset(nMargin);
|
2000-09-18 16:07:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == "SymbolTextDistance" )
|
2000-12-01 15:48:42 +00:00
|
|
|
{
|
2006-11-21 16:13:44 +00:00
|
|
|
sal_Int32 nTextDistance = 0;
|
2000-12-01 15:48:42 +00:00
|
|
|
if( aVal >>= nTextDistance )
|
|
|
|
{
|
2018-01-12 20:25:09 +01:00
|
|
|
aFmt.SetCharTextDistance(static_cast<sal_uInt16>(nTextDistance));
|
2000-12-01 15:48:42 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_BULLET_COLOR )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2021-01-15 14:49:12 +02:00
|
|
|
Color aColor;
|
|
|
|
if( aVal >>= aColor )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2021-01-15 14:49:12 +02:00
|
|
|
aFmt.SetBulletColor( aColor );
|
2000-09-18 16:07:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-04-06 15:05:52 +02:00
|
|
|
else if ( rPropName == UNO_NAME_NRULE_BULLET_RELSIZE )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-10-12 12:26:00 +00:00
|
|
|
sal_Int16 nSize = sal_Int16();
|
2000-09-18 16:07:07 +00:00
|
|
|
if( aVal >>= nSize )
|
|
|
|
{
|
2019-07-08 09:10:29 +08:00
|
|
|
// [AOO Bug 120650] the slide content corrupt when open in Aoo
|
|
|
|
// [TDF# 126234] when MS Office document being imported, the value of the relative size
|
|
|
|
// of the bullet could be as high as 400%
|
|
|
|
if ((nSize>400)||(nSize<=0))
|
2012-09-06 11:41:07 +00:00
|
|
|
{
|
|
|
|
nSize = 100;
|
|
|
|
}
|
|
|
|
|
2018-01-12 20:25:09 +01:00
|
|
|
aFmt.SetBulletRelSize( static_cast<short>(nSize) );
|
2000-09-18 16:07:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2000-11-02 14:37:23 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
throw IllegalArgumentException();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2000-12-01 15:48:42 +00:00
|
|
|
|
2001-08-06 14:48:32 +00:00
|
|
|
// check that we always have a brush item for bitmap numbering
|
|
|
|
if( aFmt.GetNumberingType() == SVX_NUM_BITMAP )
|
|
|
|
{
|
2015-11-10 10:14:16 +01:00
|
|
|
if( nullptr == aFmt.GetBrush() )
|
2001-08-06 14:48:32 +00:00
|
|
|
{
|
|
|
|
GraphicObject aGrafObj;
|
2007-05-10 14:03:08 +00:00
|
|
|
SvxBrushItem aBrushItem( aGrafObj, GPOS_AREA, SID_ATTR_BRUSH );
|
2001-08-06 14:48:32 +00:00
|
|
|
aFmt.SetGraphicBrush( &aBrushItem );
|
|
|
|
}
|
|
|
|
}
|
2018-01-12 20:25:09 +01:00
|
|
|
maRule.SetLevel( static_cast<sal_uInt16>(nIndex), aFmt );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2017-01-26 12:28:58 +01:00
|
|
|
const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule )
|
2000-09-28 11:43:21 +00:00
|
|
|
{
|
2021-09-14 08:19:47 +03:00
|
|
|
SvxUnoNumberingRules* pRule = comphelper::getFromUnoTunnel<SvxUnoNumberingRules>( xRule );
|
2015-11-10 10:14:16 +01:00
|
|
|
if( pRule == nullptr )
|
2008-06-06 11:36:07 +00:00
|
|
|
throw IllegalArgumentException();
|
2000-12-01 15:48:42 +00:00
|
|
|
|
|
|
|
return pRule->getNumRule();
|
|
|
|
}
|
|
|
|
|
2021-05-31 09:19:20 +02:00
|
|
|
css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(const SvxNumRule& rRule)
|
2000-12-01 15:48:42 +00:00
|
|
|
{
|
2021-05-31 09:19:20 +02:00
|
|
|
return new SvxUnoNumberingRules( rRule );
|
2000-12-01 15:48:42 +00:00
|
|
|
}
|
|
|
|
|
Extend loplugin:external to warn about classes
...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend
loplugin:external to warn about enums".
Cases where free functions were moved into an unnamed namespace along with a
class, to not break ADL, are in:
filter/source/svg/svgexport.cxx
sc/source/filter/excel/xelink.cxx
sc/source/filter/excel/xilink.cxx
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
All other free functions mentioning moved classes appear to be harmless and not
give rise to (silent, even) ADL breakage. (One remaining TODO in
compilerplugins/clang/external.cxx is that derived classes are not covered by
computeAffectedTypes, even though they could also be affected by ADL-breakage---
but don't seem to be in any acutal case across the code base.)
For friend declarations using elaborate type specifiers, like
class C1 {};
class C2 { friend class C1; };
* If C2 (but not C1) is moved into an unnamed namespace, the friend declaration
must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see
C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither
qualified nor a template-id and the declaration is a function or an
elaborated-type-specifier, the lookup to determine whether the entity has been
previously declared shall not consider any scopes outside the innermost
enclosing namespace.")
* If C1 (but not C2) is moved into an unnamed namespace, the friend declaration
must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882>
"elaborated-type-specifier friend not looked up in unnamed namespace".
Apart from that, to keep changes simple and mostly mechanical (which should help
avoid regressions), out-of-line definitions of class members have been left in
the enclosing (named) namespace. But explicit specializations of class
templates had to be moved into the unnamed namespace to appease
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of
template from unnamed namespace using unqualified-id in enclosing namespace".
Also, accompanying declarations (of e.g. typedefs or static variables) that
could arguably be moved into the unnamed namespace too have been left alone.
And in some cases, mention of affected types in blacklists in other loplugins
needed to be adapted.
And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which
is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is
not moved into an unnamed namespace (because it is declared in
sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about
such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler
doesn’t give this warning for types defined in the main .C file, as those are
unlikely to have multiple definitions."
(<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) The
warned-about classes also don't have multiple definitions in the given test, so
disable the warning when including the .cxx.
Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4
Reviewed-on: https://gerrit.libreoffice.org/83239
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-19 16:32:49 +01:00
|
|
|
namespace {
|
|
|
|
|
2008-06-06 11:36:07 +00:00
|
|
|
class SvxUnoNumberingRulesCompare : public ::cppu::WeakAggImplHelper1< XAnyCompare >
|
2000-12-01 15:48:42 +00:00
|
|
|
{
|
|
|
|
public:
|
2017-01-26 12:28:58 +01:00
|
|
|
virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) override;
|
2000-12-01 15:48:42 +00:00
|
|
|
};
|
|
|
|
|
Extend loplugin:external to warn about classes
...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend
loplugin:external to warn about enums".
Cases where free functions were moved into an unnamed namespace along with a
class, to not break ADL, are in:
filter/source/svg/svgexport.cxx
sc/source/filter/excel/xelink.cxx
sc/source/filter/excel/xilink.cxx
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
All other free functions mentioning moved classes appear to be harmless and not
give rise to (silent, even) ADL breakage. (One remaining TODO in
compilerplugins/clang/external.cxx is that derived classes are not covered by
computeAffectedTypes, even though they could also be affected by ADL-breakage---
but don't seem to be in any acutal case across the code base.)
For friend declarations using elaborate type specifiers, like
class C1 {};
class C2 { friend class C1; };
* If C2 (but not C1) is moved into an unnamed namespace, the friend declaration
must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see
C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither
qualified nor a template-id and the declaration is a function or an
elaborated-type-specifier, the lookup to determine whether the entity has been
previously declared shall not consider any scopes outside the innermost
enclosing namespace.")
* If C1 (but not C2) is moved into an unnamed namespace, the friend declaration
must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882>
"elaborated-type-specifier friend not looked up in unnamed namespace".
Apart from that, to keep changes simple and mostly mechanical (which should help
avoid regressions), out-of-line definitions of class members have been left in
the enclosing (named) namespace. But explicit specializations of class
templates had to be moved into the unnamed namespace to appease
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of
template from unnamed namespace using unqualified-id in enclosing namespace".
Also, accompanying declarations (of e.g. typedefs or static variables) that
could arguably be moved into the unnamed namespace too have been left alone.
And in some cases, mention of affected types in blacklists in other loplugins
needed to be adapted.
And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which
is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is
not moved into an unnamed namespace (because it is declared in
sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about
such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler
doesn’t give this warning for types defined in the main .C file, as those are
unlikely to have multiple definitions."
(<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) The
warned-about classes also don't have multiple definitions in the given test, so
disable the warning when including the .cxx.
Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4
Reviewed-on: https://gerrit.libreoffice.org/83239
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-19 16:32:49 +01:00
|
|
|
}
|
|
|
|
|
2017-01-26 12:28:58 +01:00
|
|
|
sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 )
|
2008-06-06 11:36:07 +00:00
|
|
|
{
|
|
|
|
return SvxUnoNumberingRules::Compare( Any1, Any2 );
|
|
|
|
}
|
|
|
|
|
|
|
|
sal_Int16 SvxUnoNumberingRules::Compare( const Any& Any1, const Any& Any2 )
|
2000-12-01 15:48:42 +00:00
|
|
|
{
|
2008-06-06 11:36:07 +00:00
|
|
|
Reference< XIndexReplace > x1( Any1, UNO_QUERY ), x2( Any2, UNO_QUERY );
|
2000-12-01 15:48:42 +00:00
|
|
|
if( x1.is() && x2.is() )
|
|
|
|
{
|
|
|
|
if( x1.get() == x2.get() )
|
|
|
|
return 0;
|
|
|
|
|
2021-09-14 08:19:47 +03:00
|
|
|
SvxUnoNumberingRules* pRule1 = comphelper::getFromUnoTunnel<SvxUnoNumberingRules>( x1 );
|
2000-12-01 15:48:42 +00:00
|
|
|
if( pRule1 )
|
|
|
|
{
|
2021-09-14 08:19:47 +03:00
|
|
|
SvxUnoNumberingRules* pRule2 = comphelper::getFromUnoTunnel<SvxUnoNumberingRules>( x2 );
|
2000-12-01 15:48:42 +00:00
|
|
|
if( pRule2 )
|
|
|
|
{
|
|
|
|
const SvxNumRule& rRule1 = pRule1->getNumRule();
|
|
|
|
const SvxNumRule& rRule2 = pRule2->getNumRule();
|
|
|
|
|
2011-01-13 14:12:48 +01:00
|
|
|
const sal_uInt16 nLevelCount1 = rRule1.GetLevelCount();
|
|
|
|
const sal_uInt16 nLevelCount2 = rRule2.GetLevelCount();
|
2001-08-01 07:20:20 +00:00
|
|
|
|
|
|
|
if( nLevelCount1 == 0 || nLevelCount2 == 0 )
|
2000-12-01 15:48:42 +00:00
|
|
|
return -1;
|
|
|
|
|
2011-01-13 14:12:48 +01:00
|
|
|
for( sal_uInt16 i = 0; (i < nLevelCount1) && (i < nLevelCount2); i++ )
|
2000-12-01 15:48:42 +00:00
|
|
|
{
|
2008-06-06 11:36:07 +00:00
|
|
|
if( rRule1.GetLevel(i) != rRule2.GetLevel(i) )
|
2000-12-01 15:48:42 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
2000-09-28 11:43:21 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2021-04-30 08:20:03 +02:00
|
|
|
Reference< XAnyCompare > SvxCreateNumRuleCompare() noexcept
|
2000-09-28 11:43:21 +00:00
|
|
|
{
|
2017-02-20 19:57:28 +01:00
|
|
|
return new SvxUnoNumberingRulesCompare;
|
2000-09-28 11:43:21 +00:00
|
|
|
}
|
2009-12-10 22:07:30 +01:00
|
|
|
|
2017-12-22 10:50:40 +00:00
|
|
|
css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule()
|
2009-12-10 22:07:30 +01:00
|
|
|
{
|
2015-03-25 14:42:40 +02:00
|
|
|
SvxNumRule aTempRule( SvxNumRuleFlags::NONE, 10, false );
|
2021-05-31 09:19:20 +02:00
|
|
|
return SvxCreateNumRule( aTempRule );
|
2009-12-10 22:07:30 +01:00
|
|
|
}
|
2010-10-12 15:53:47 +02:00
|
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|