[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - 59 commits - comphelper/Library_comphelper.mk comphelper/source compilerplugins/clang config_host/config_global.h.in configure.ac download.lst dtrans/source extensions/source external/jpeg-turbo external/libmwaw filter/source formula/source framework/inc framework/source helpcontent2 include/comphelper include/filter include/formula include/oox include/rtl include/svx include/tools include/ucbhelper ios/experimental libreofficekit/source lotuswordpro/source odk/CustomTarget_check.mk offapi/com oox/source qadevOOo/tests sax/qa sax/source sc/inc sc/source sd/source sfx2/source sot/source starmath/inc starmath/source svx/source sw/qa sw/source toolkit/source tools/source ucbhelper/source ucb/source uitest/writer_tests unoidl/CustomTarget_unoidl-write_test.mk unotools/source unoxml/qa unoxml/source vbahelper/source vcl/source vcl/unx vcl/workben writerfilter/source xmlhelp/source xmloff/inc xmloff/source xmlscript/sourc e xmlsecurity/inc
Stephan Bergmann
sbergman at redhat.com
Fri Jun 16 13:54:08 UTC 2017
comphelper/Library_comphelper.mk | 1
comphelper/source/misc/asyncnotification.cxx | 1
comphelper/source/misc/profilezone.cxx | 105 +++
compilerplugins/clang/constparams.cxx | 3
compilerplugins/clang/unusedfields.cxx | 41 +
config_host/config_global.h.in | 1
configure.ac | 18
download.lst | 4
dtrans/source/win32/ftransl/ftransl.cxx | 2
extensions/source/ole/unoobjw.cxx | 2
external/jpeg-turbo/ExternalProject_jpeg-turbo.mk | 1
external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 | 25
external/libmwaw/UnpackedTarball_libmwaw.mk | 1
filter/source/graphicfilter/ieps/ieps.cxx | 14
formula/source/core/api/FormulaCompiler.cxx | 58 +
formula/source/core/api/token.cxx | 181 -----
framework/inc/helper/statusindicatorfactory.hxx | 6
framework/source/loadenv/loadenv.cxx | 2
framework/source/services/dispatchhelper.cxx | 2
helpcontent2 | 2
include/comphelper/profilezone.hxx | 51 +
include/filter/msfilter/rtfutil.hxx | 3
include/formula/FormulaCompiler.hxx | 6
include/formula/tokenarray.hxx | 37 -
include/oox/core/filterdetect.hxx | 1
include/oox/core/fragmenthandler.hxx | 1
include/rtl/string.hxx | 13
include/rtl/ustring.hxx | 32 -
include/svx/xbtmpit.hxx | 2
include/tools/resmgr.hxx | 4
include/tools/stream.hxx | 2
include/ucbhelper/interactionrequest.hxx | 2
ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 231 -------
ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift | 181 +----
ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist | 2
ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard | 136 ++--
ios/experimental/LibreOfficeLight/LibreOfficeLightTests/Info.plist | 22
ios/experimental/LibreOfficeLight/LibreOfficeLightTests/LibreOfficeLightTests.swift | 36 -
ios/experimental/LibreOfficeLight/LibreOfficeLightUITests/Info.plist | 22
ios/experimental/LibreOfficeLight/LibreOfficeLightUITests/LibreOfficeLightUITests.swift | 36 -
libreofficekit/source/gtk/lokdocview.cxx | 3
lotuswordpro/source/filter/lwppagelayout.cxx | 16
odk/CustomTarget_check.mk | 5
offapi/com/sun/star/awt/XToolkitExperimental.idl | 22
offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl | 6
oox/source/core/filterdetect.cxx | 4
oox/source/core/fragmenthandler.cxx | 4
oox/source/crypto/DocumentDecryption.cxx | 2
oox/source/docprop/docprophandler.cxx | 4
oox/source/docprop/docprophandler.hxx | 1
qadevOOo/tests/java/ifc/util/_XReplaceable.java | 2
qadevOOo/tests/java/ifc/util/_XSearchable.java | 2
sax/qa/cppunit/xmlimport.cxx | 3
sax/qa/data/nestedns.xml | 2
sax/source/fastparser/fastparser.cxx | 48 +
sax/source/fastparser/legacyfastparser.cxx | 7
sc/inc/attarray.hxx | 7
sc/inc/externalrefmgr.hxx | 2
sc/source/core/data/attarray.cxx | 7
sc/source/core/data/column4.cxx | 23
sc/source/core/tool/compiler.cxx | 51 -
sc/source/core/tool/interpr4.cxx | 5
sc/source/core/tool/interpr7.cxx | 6
sc/source/filter/excel/exctools.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 12
sc/source/ui/unoobj/docuno.cxx | 7
sc/source/ui/unoobj/funcuno.cxx | 2
sc/source/ui/unoobj/viewuno.cxx | 2
sc/source/ui/view/viewfun2.cxx | 8
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 4
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 1
sd/source/ui/unoidl/unomodel.cxx | 3
sd/source/ui/unoidl/unopage.cxx | 2
sd/source/ui/unoidl/unopback.cxx | 11
sd/source/ui/unoidl/unopback.hxx | 6
sd/source/ui/view/drviews2.cxx | 10
sfx2/source/doc/sfxbasemodel.cxx | 4
sot/source/sdstor/stgio.cxx | 2
starmath/inc/document.hxx | 2
starmath/source/document.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 8
svx/source/unodraw/UnoNameItemTable.cxx | 4
svx/source/xoutdev/xattrbmp.cxx | 26
sw/qa/extras/odfexport/data/tdf103091.fodt | 307 ++++++++++
sw/qa/extras/odfexport/odfexport.cxx | 67 ++
sw/qa/extras/rtfexport/rtfexport.cxx | 10
sw/source/core/doc/docsort.cxx | 2
sw/source/core/inc/cellfrm.hxx | 1
sw/source/core/layout/findfrm.cxx | 15
sw/source/core/layout/tabfrm.cxx | 27
sw/source/core/unocore/unodraw.cxx | 3
sw/source/core/unocore/unoobj.cxx | 3
sw/source/core/unocore/unotext.cxx | 4
sw/source/filter/html/swhtml.cxx | 109 +--
sw/source/filter/ww8/rtfexportfilter.hxx | 8
sw/source/filter/ww8/rtfsdrexport.cxx | 41 +
sw/source/filter/ww8/rtfstringbuffer.cxx | 6
sw/source/filter/ww8/rtfstringbuffer.hxx | 4
sw/source/filter/ww8/ww8par2.hxx | 4
sw/source/filter/ww8/ww8par5.cxx | 24
sw/source/filter/ww8/ww8par6.cxx | 19
sw/source/ui/chrdlg/chardlg.cxx | 2
sw/source/uibase/docvw/SidebarScrollBar.hxx | 2
sw/source/uibase/shells/basesh.cxx | 5
sw/source/uibase/uiview/viewtab.cxx | 3
sw/source/uibase/uno/unotxvw.cxx | 6
toolkit/source/awt/vclxtoolkit.cxx | 23
toolkit/source/awt/vclxwindow.cxx | 2
tools/source/rc/resmgr.cxx | 8
tools/source/stream/strmunx.cxx | 2
ucb/source/ucp/ftp/ftpintreq.cxx | 2
ucb/source/ucp/ftp/ftpintreq.hxx | 4
ucbhelper/source/provider/interactionrequest.cxx | 3
uitest/writer_tests/pageDialog.py | 78 ++
unoidl/CustomTarget_unoidl-write_test.mk | 4
unotools/source/config/extendedsecurityoptions.cxx | 4
unoxml/qa/unit/domtest.cxx | 4
unoxml/source/dom/documentbuilder.cxx | 3
vbahelper/source/msforms/vbacontrol.cxx | 3
vbahelper/source/msforms/vbacontrol.hxx | 1
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx | 10
vbahelper/source/vbahelper/vbacommandbarcontrol.hxx | 5
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 8
vcl/source/app/scheduler.cxx | 3
vcl/source/app/svmain.cxx | 18
vcl/source/gdi/bitmapex.cxx | 15
vcl/unx/gtk/gtkinst.cxx | 6
vcl/workben/fftester.cxx | 14
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 4
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 1
writerfilter/source/rtftok/rtfsdrimport.cxx | 41 +
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 3
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 1
xmloff/inc/txtfldi.hxx | 1
xmloff/inc/txtvfldi.hxx | 3
xmloff/source/draw/ximp3dobject.cxx | 20
xmloff/source/draw/ximp3dobject.hxx | 4
xmloff/source/style/PageMasterExportPropMapper.cxx | 12
xmloff/source/table/XMLTableImport.cxx | 5
xmloff/source/text/txtfldi.cxx | 2
xmloff/source/text/txtvfldi.cxx | 12
xmlscript/source/xmlmod_imexp/imp_share.hxx | 5
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 2
xmlsecurity/inc/xmlsignaturehelper.hxx | 8
144 files changed, 1502 insertions(+), 1154 deletions(-)
New commits:
commit 2dbd27012a23f113cf0daf5a0bb8368ebc3a9f89
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 16 15:39:47 2017 +0200
Still more tests to suppress
...that were missing from 3de594d3347ead24f3211714f0e0010c1434cdf2 "More tests
to suppress (all .PHONY test targets should be covered now)" (and one wasn't
even properly marked as .PHONY). Thanks to Rene for spotting.
Change-Id: Ieed81a3999921bdfe9bca96c6002d8906b2ddfad
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index dc983e2f67d8..f0b63489f054 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -24,6 +24,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\
$(if $(filter MACOSX,$(OS)),macosx,\
$(if $(filter AIX,$(OS)),aix))))))))
+.PHONY: $(call gb_CustomTarget_get_workdir,odk/check)/checkbin
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \
@@ -38,6 +39,9 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
+ifneq ($(gb_SUPPRESS_TESTS),)
+ @true
+else
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
$(call gb_Helper_print_on_error,\
$(PERL) $< \
@@ -45,5 +49,6 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(odk_PLATFORM) '$(gb_Executable_EXT)' \
,$@.log \
)
+endif
# vim: set noet sw=4 ts=4:
diff --git a/unoidl/CustomTarget_unoidl-write_test.mk b/unoidl/CustomTarget_unoidl-write_test.mk
index 22c25b0085c5..a1c17c488bc3 100644
--- a/unoidl/CustomTarget_unoidl-write_test.mk
+++ b/unoidl/CustomTarget_unoidl-write_test.mk
@@ -25,6 +25,9 @@ $(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) : \
$(SRCDIR)/idlc/test/parser/struct.tests \
$(SRCDIR)/idlc/test/parser/typedef.tests \
| $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/.dir
+ifneq ($(gb_SUPPRESS_TESTS),)
+ @true
+else
$(call gb_Helper_abbreviate_dirs,( \
$(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/attribute.tests \
@@ -87,5 +90,6 @@ $(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) : \
{} \
$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
+endif
# vim: set noet sw=4 ts=4:
commit c127c19de62201b49b6647ef3ee8b08ae49da852
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 16 10:57:12 2017 +0200
Remove HAVE_CXX11_REF_QUALIFIER, always true now
...after 579497164f6bddfeb14bb6b0f4b9cd3322af1803 "Bump GCC baseline to 4.8.1"
Make this a fatal configuration error for now. The check should be removed
completely after LO 6.0 branch-off.
Change-Id: I70cf65d6b0eb7158008f28449794c66c1b775916
Reviewed-on: https://gerrit.libreoffice.org/38869
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 1becb71a5ba5..850792479644 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -13,7 +13,6 @@ Any change in this header will cause a rebuild of almost everything.
#define CONFIG_GLOBAL_H
#define HAVE_CXX14_CONSTEXPR 0
-#define HAVE_CXX11_REF_QUALIFIER 0
#define HAVE_GCC_BUILTIN_ATOMIC 0
/* _Pragma */
#define HAVE_GCC_PRAGMA_OPERATOR 0
diff --git a/configure.ac b/configure.ac
index 9ebf25de6efd..f0c09476b7b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6228,8 +6228,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
AC_LANG_POP([C++])
CXXFLAGS=$save_CXXFLAGS
AC_MSG_RESULT([$cxx11_ref_qualifier])
-if test "$cxx11_ref_qualifier" = yes; then
- AC_DEFINE([HAVE_CXX11_REF_QUALIFIER])
+if test "$cxx11_ref_qualifier" = no; then
+ AC_MSG_ERROR([Your $CXX does not support C++11 ref-qualifiers. This is no longer supported.])
fi
dnl _Pragma support (may require C++11)
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 2753713fc66f..c116250aa396 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -33,7 +33,6 @@
#include <rtl/stringutils.hxx>
#ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
-#include <config_global.h>
#include <rtl/stringconcat.hxx>
#endif
@@ -351,14 +350,14 @@ public:
@param str a OString.
*/
OString & operator+=( const OString & str )
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
&
#endif
{
rtl_string_newConcat( &pData, pData, str.pData );
return *this;
}
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
void operator+=(OString const &) && = delete;
#endif
@@ -368,11 +367,7 @@ public:
@internal
*/
template< typename T1, typename T2 >
- OString& operator+=( const OStringConcat< T1, T2 >& c )
-#if HAVE_CXX11_REF_QUALIFIER
- &
-#endif
- {
+ OString& operator+=( const OStringConcat< T1, T2 >& c ) & {
sal_Int32 l = c.length();
if( l == 0 )
return *this;
@@ -383,11 +378,9 @@ public:
pData->length = l;
return *this;
}
-#if HAVE_CXX11_REF_QUALIFIER
template<typename T1, typename T2> void operator +=(
OStringConcat<T1, T2> const &) && = delete;
#endif
-#endif
/**
Clears the string, i.e, makes a zero-character string
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index e4dfe8d8346d..5f41ff3ea2ea 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -523,7 +523,7 @@ public:
@exception std::bad_alloc is thrown if an out-of-memory condition occurs
*/
OUString & operator+=( const OUString & str )
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
&
#endif
{
@@ -536,7 +536,7 @@ public:
rtl_uString_release(pNewData);
return *this;
}
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
void operator+=(OUString const &) && = delete;
#endif
@@ -549,7 +549,7 @@ public:
template<typename T>
typename libreoffice_internal::ConstCharArrayDetector<T, OUString &>::Type
operator +=(T & literal)
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
&
#endif
{
@@ -561,7 +561,7 @@ public:
libreoffice_internal::ConstCharArrayDetector<T>::length);
return *this;
}
-#if defined LIBO_INTERNAL_ONLY && HAVE_CXX11_REF_QUALIFIER
+#if defined LIBO_INTERNAL_ONLY
template<typename T>
typename libreoffice_internal::ConstCharArrayDetector<T, OUString &>::Type
operator +=(T &) && = delete;
@@ -572,37 +572,25 @@ public:
template<typename T>
typename
libreoffice_internal::ConstCharArrayDetector<T, OUString &>::TypeUtf16
- operator +=(T & literal)
-#if HAVE_CXX11_REF_QUALIFIER
- &
-#endif
- {
+ operator +=(T & literal) & {
rtl_uString_newConcatUtf16L(
&pData, pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return *this;
}
-#if HAVE_CXX11_REF_QUALIFIER
template<typename T>
typename
libreoffice_internal::ConstCharArrayDetector<T, OUString &>::TypeUtf16
operator +=(T &) && = delete;
-#endif
/** @overload @since LibreOffice 5.4 */
- OUString & operator +=(OUStringLiteral const & literal)
-#if HAVE_CXX11_REF_QUALIFIER
- &
-#endif
- {
+ OUString & operator +=(OUStringLiteral const & literal) & {
rtl_uString_newConcatAsciiL(&pData, pData, literal.data, literal.size);
return *this;
}
-#if HAVE_CXX11_REF_QUALIFIER
void operator +=(OUStringLiteral const &) && = delete;
#endif
-#endif
#ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
/**
@@ -610,11 +598,7 @@ public:
@internal
*/
template< typename T1, typename T2 >
- OUString& operator+=( const OUStringConcat< T1, T2 >& c )
-#if HAVE_CXX11_REF_QUALIFIER
- &
-#endif
- {
+ OUString& operator+=( const OUStringConcat< T1, T2 >& c ) & {
sal_Int32 l = c.length();
if( l == 0 )
return *this;
@@ -625,11 +609,9 @@ public:
pData->length = l;
return *this;
}
-#if HAVE_CXX11_REF_QUALIFIER
template<typename T1, typename T2> void operator +=(
OUStringConcat<T1, T2> const &) && = delete;
#endif
-#endif
/**
Clears the string, i.e, makes a zero-character string
commit 9c0cd667da908ec1dde193c83d7d69a31b43e934
Author: Eike Rathke <erack at redhat.com>
Date: Fri Jun 16 15:06:18 2017 +0200
Resolves: tdf#71339 include selected top/left empty rows/columns in AutoSum
Keep the exclusion for determining the direction, but include them in the final
formula result and selection.
Change-Id: Ic752229bad17ac25de9ef598f3da32e0fd257fd1
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index fca59b3e8425..3d67909bc3b7 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -633,7 +633,8 @@ bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor
if ( !pDoc->IsBlockEmpty( nTab, nCol, nStartRow, nCol, nSumEndRow ) )
{
ScRangeList aRangeList;
- const ScRange aRange( nCol, nStartRow, nTab, nCol, nSumEndRow, nTab );
+ // Include the originally selected start row.
+ const ScRange aRange( nCol, rRange.aStart.Row(), nTab, nCol, nSumEndRow, nTab );
if ( lcl_GetAutoSumForColumnRange( pDoc, aRangeList, aRange ) )
{
const OUString aFormula = GetAutoSumFormula(
@@ -667,7 +668,8 @@ bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor
if ( !pDoc->IsBlockEmpty( nTab, nStartCol, nRow, nSumEndCol, nRow ) )
{
ScRangeList aRangeList;
- const ScRange aRange( nStartCol, nRow, nTab, nSumEndCol, nRow, nTab );
+ // Include the originally selected start column.
+ const ScRange aRange( rRange.aStart.Col(), nRow, nTab, nSumEndCol, nRow, nTab );
if ( lcl_GetAutoSumForRowRange( pDoc, aRangeList, aRange ) )
{
const OUString aFormula = GetAutoSumFormula( aRangeList, bSubTotal, ScAddress(nInsCol, nRow, nTab) );
@@ -678,7 +680,7 @@ bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor
}
// set new mark range and cursor position
- const ScRange aMarkRange( nStartCol, nStartRow, nTab, nMarkEndCol, nMarkEndRow, nTab );
+ const ScRange aMarkRange( rRange.aStart.Col(), rRange.aStart.Row(), nTab, nMarkEndCol, nMarkEndRow, nTab );
MarkRange( aMarkRange, false, bContinue );
if ( bSetCursor )
{
commit 08f6f9dded1b142b858c455da03319abac691655
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Thu Mar 30 14:25:40 2017 +0200
Profiling API: add ProfileZones
Change-Id: Ie5669bd75d9b4be047d98402cb69ac313ab618df
Reviewed-on: https://gerrit.libreoffice.org/38787
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index db6398364656..be441c67e3a3 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -44,6 +44,7 @@
#include <osl/interlck.h>
#include <com/sun/star/uno/genfunc.h>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include "comifaces.hxx"
#include "jscriptclasses.hxx"
@@ -785,6 +786,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember,
EXCEPINFO * pexcepinfo,
unsigned int * puArgErr )
{
+ ::comphelper::ProfileZone aZone("COM Bridge");
HRESULT ret = S_OK;
try
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 99dbb690afb6..54b17462c40e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -84,6 +84,7 @@
#include <rtl/bootstrap.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase.hxx>
+#include <comphelper/profilezone.hxx>
const char PROP_TYPES[] = "Types";
const char PROP_NAME[] = "Name";
@@ -143,6 +144,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
{
css::uno::Reference< css::lang::XComponent > xComponent;
+ ::comphelper::ProfileZone aZone("loadComponentFromURL");
try
{
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index da6bc9c52997..305367649678 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
namespace framework{
@@ -113,6 +114,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
bool SyncronFlag ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
+ ::comphelper::ProfileZone aZone("executeDispatch");
css::uno::Reference< css::uno::XInterface > xTHIS(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
m_aResult.clear();
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 305e788670cb..2c55292e40a9 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -68,6 +68,7 @@
#include <com/sun/star/script/XInvocation.hpp>
#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/string.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -1989,7 +1990,10 @@ void SAL_CALL ScModelObj::calculate()
{
SolarMutexGuard aGuard;
if (pDocShell)
+ {
+ ::comphelper::ProfileZone aZone("calculate");
pDocShell->DoRecalc(true);
+ }
else
{
OSL_FAIL("no DocShell"); //! throw exception?
@@ -2000,7 +2004,10 @@ void SAL_CALL ScModelObj::calculateAll()
{
SolarMutexGuard aGuard;
if (pDocShell)
+ {
+ ::comphelper::ProfileZone aZone("calculateAll");
pDocShell->DoHardRecalc();
+ }
else
{
OSL_FAIL("no DocShell"); //! throw exception?
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 612ab210d246..b7b502aa9191 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -39,6 +39,7 @@
#include <sfx2/printer.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <toolkit/helper/convert.hxx>
@@ -1070,6 +1071,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet()
void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreadsheet>& xActiveSheet )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("setActiveSheet");
ScTabViewShell* pViewSh = GetViewShell();
if ( pViewSh && xActiveSheet.is() )
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 71e52c5a11f8..226df8a516ac 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -127,6 +127,10 @@ void QueueProcessor::ProcessRequests()
::osl::MutexGuard aGuard (mrQueue.GetMutex());
if ( ! mrQueue.IsEmpty())
Start(mrQueue.GetFrontPriorityClass());
+ else
+ {
+ ::comphelper::ProfileZone aZone("QueueProcessor finished processing all elements");
+ }
}
}
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index aafe0648062e..0734decad408 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -32,6 +32,7 @@
#include <svx/svdpagv.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
+#include <comphelper/profilezone.hxx>
#include <functional>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 2c85154539bf..17c8d271402d 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -38,6 +38,7 @@
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include <editeng/unofield.hxx>
#include <notifydocumentevent.hxx>
@@ -2900,6 +2901,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasElements()
uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
{
::SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("insertNewByIndex");
if( nullptr == mpModel )
throw lang::DisposedException();
@@ -3054,6 +3056,7 @@ sal_Int32 SAL_CALL SdMasterPagesAccess::getCount()
uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index )
{
::SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SdMasterPagesAccess::getByIndex");
if( nullptr == mpModel )
throw lang::DisposedException();
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 71078895f0fb..081b25604a84 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/view/PaperOrientation.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx>
@@ -2361,6 +2362,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( )
void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& xMasterPage )
{
::SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("setMasterPage");
throwIfDisposed();
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 44ae593893e2..f0efafec87e8 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -118,6 +118,7 @@
#include <sfx2/DocumentMetadataAccess.hxx>
#include "printhelper.hxx"
#include <sfx2/sfxresid.hxx>
+#include <comphelper/profilezone.hxx>
// namespaces
@@ -1571,6 +1572,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue >
void SAL_CALL SfxBaseModel::store()
{
+ ::comphelper::ProfileZone aZone("store");
storeSelf( Sequence< beans::PropertyValue >() );
}
@@ -1582,6 +1584,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL
const Sequence< beans::PropertyValue >& rArgs )
{
SfxModelGuard aGuard( *this );
+ ::comphelper::ProfileZone aZone("storeAs");
if ( m_pData->m_pObjectShell.is() )
{
@@ -1621,6 +1624,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL
const Sequence< beans::PropertyValue >& rArgs )
{
SfxModelGuard aGuard( *this );
+ ::comphelper::ProfileZone aZone("storeToURL");
if ( m_pData->m_pObjectShell.is() )
{
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 4d38ba0961a3..cab1dace59ce 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -25,6 +25,7 @@
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -93,6 +94,7 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons
void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const uno::Any& aElement )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SvxUnoNameItemTable::insertByName");
if( hasByName( aApiName ) )
throw container::ElementExistException();
@@ -106,6 +108,7 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const
void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SvxUnoNameItemTable::removeByName");
// a little quickfix for 2.0 to let applications clear api
// created items that are not used
@@ -191,6 +194,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SvxUnoNameItemTable::getByName");
OUString aName = SvxUnogetInternalNameForItem(mnWhich, aApiName);
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 81e9831d1125..70cec6decfbd 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -59,6 +59,7 @@
#include <svx/shapepropertynotifier.hxx>
#include <crstate.hxx>
#include <comphelper/extract.hxx>
+#include <comphelper/profilezone.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svx/scene3d.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
@@ -2338,6 +2339,8 @@ awt::Size SAL_CALL SwXShape::getSize()
void SAL_CALL SwXShape::setSize( const awt::Size& aSize )
{
+ ::comphelper::ProfileZone aZone("SwXShape::setSize");
+
if ( mxShape.is() )
{
mxShape->setSize( aSize );
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 7983e3c1a9d5..d2723423f23d 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -106,6 +106,7 @@
#include <unoparaframeenum.hxx>
#include <unoparagraph.hxx>
#include <comphelper/servicehelper.hxx>
+#include <comphelper/profilezone.hxx>
using namespace ::com::sun::star;
@@ -963,6 +964,7 @@ void SAL_CALL
SwXTextCursor::gotoStart(sal_Bool Expand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("gotoStart");
SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
@@ -1019,6 +1021,7 @@ void SAL_CALL
SwXTextCursor::gotoEnd(sal_Bool Expand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("gotoEnd");
SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index d166bba9ad6c..51536228f60a 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -32,6 +32,7 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -284,6 +285,7 @@ SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange,
const OUString& rString, sal_Bool bAbsorb)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXText::insertString");
if (!xTextRange.is())
{
@@ -500,6 +502,7 @@ SwXText::insertTextContent(
sal_Bool bAbsorb)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXText::insertTextContent");
if (!xRange.is())
{
@@ -849,6 +852,7 @@ uno::Reference< text::XText > SAL_CALL
SwXText::getText()
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXText::getText");
const uno::Reference< text::XText > xRet(this);
return xRet;
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 94c19a4872b2..aaeb9e6ae5e1 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -74,6 +74,7 @@
#include "swdtflvr.hxx"
#include <vcl/svapp.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -481,6 +482,7 @@ void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode )
uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor()
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("getViewCursor");
if(GetView())
{
if(!mxTextViewCursor.is())
@@ -1139,6 +1141,7 @@ void SwXTextViewCursor::gotoRange(
void SwXTextViewCursor::gotoStart(sal_Bool bExpand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXTextViewCursor::gotoStart");
if(m_pView)
{
if (!IsTextSelection())
@@ -1153,6 +1156,7 @@ void SwXTextViewCursor::gotoStart(sal_Bool bExpand)
void SwXTextViewCursor::gotoEnd(sal_Bool bExpand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXTextViewCursor::gotoEnd");
if(m_pView)
{
if (!IsTextSelection())
@@ -1548,6 +1552,7 @@ Any SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName )
sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXTextViewCursor::goDown");
bool bRet = false;
if(m_pView)
{
@@ -1564,6 +1569,7 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXTextViewCursor::goUp");
bool bRet = false;
if(m_pView)
{
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index ae2fc3e0b753..bc221aae7a0c 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -56,6 +56,7 @@
#include <vcl/settings.hxx>
#include <comphelper/asyncnotification.hxx>
#include <comphelper/flagguard.hxx>
+#include <comphelper/profilezone.hxx>
#include "stylesettings.hxx"
#include <tools/urlobj.hxx>
@@ -964,6 +965,7 @@ void VCLXWindow::removeEventListener( const css::uno::Reference< css::lang::XEve
void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("setPosSize");
if ( GetWindow() )
{
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index e5109bc71f1c..1c52ad170d28 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -22,6 +22,7 @@
#include <vcl/scheduler.hxx>
#include <saltimer.hxx>
#include <salinst.hxx>
+#include <comphelper/profilezone.hxx>
namespace {
const sal_uInt64 MaximumTimeoutMs = 1000 * 60; // 1 minute
@@ -153,6 +154,8 @@ bool Scheduler::ProcessTaskScheduling( bool bIdle )
if ( pMostUrgent )
{
+ ::comphelper::ProfileZone aZone( pMostUrgent->GetDebugName() );
+
SAL_INFO("vcl.schedule", "Invoke task " << pMostUrgent->GetDebugName());
pMostUrgent->mnUpdateTime = nTime;
commit 6ade80cf142664e78954c7544534e9436ceb90c7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jun 16 08:35:05 2017 +0200
tdf#108524 sw: allow move of frame inside section without columns
The intention here is to deny the move of a frame that's inside a table
inside a section. But the code also checked if there a column frame
in-between, so it allowed the move for a frame in a section with 2 cols,
but not without columns (which does not sound intentional, since that's
a simpler case). So drop the requirement to have a column frame between
the argument and the section frame, just check that there is no table
frame in between.
This is needed, but not enough to split the section in the bugdoc (but
at least now the content of the section is marked as movable).
Change-Id: I9155b291a19c692efc30f01f8e206fac5f1ccf81
Reviewed-on: https://gerrit.libreoffice.org/38858
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 490a95439715..74942256bef4 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1252,17 +1252,14 @@ void SwFrame::InvalidateNextPrtArea()
}
}
-/// @returns true if the frame _directly_ sits in a section with columns
-/// but not if it sits in a table which itself sits in a section with columns.
-static bool lcl_IsInColSct( const SwFrame *pUp )
+/// @returns true if the frame _directly_ sits in a section
+/// but not if it sits in a table which itself sits in a section.
+static bool lcl_IsInSectionDirectly( const SwFrame *pUp )
{
- bool bRet = false;
while( pUp )
{
- if( pUp->IsColumnFrame() )
- bRet = true;
- else if( pUp->IsSctFrame() )
- return bRet;
+ if( pUp->IsSctFrame() )
+ return true;
else if( pUp->IsTabFrame() )
return false;
pUp = pUp->GetUpper();
@@ -1289,7 +1286,7 @@ bool SwFrame::IsMoveable( const SwLayoutFrame* _pLayoutFrame ) const
if ( _pLayoutFrame && IsFlowFrame() )
{
- if ( _pLayoutFrame->IsInSct() && lcl_IsInColSct( _pLayoutFrame ) )
+ if ( _pLayoutFrame->IsInSct() && lcl_IsInSectionDirectly( _pLayoutFrame ) )
{
bRetVal = true;
}
commit 559b641b3ff3500547bf7c79741e1e5b4414d404
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date: Thu Jun 15 22:01:55 2017 -0300
Updated core
Project: help e24e053c82ad4ee86dd7eb4e9490c9c62af2b291
tdf#107573 help page for change of UI term outline
Change Tools -> Outline numbering to Tools -> Chapter numbering
Change-Id: Id820b226f08d3c224512e34fd96d37ed4c2c300d
Reviewed-on: https://gerrit.libreoffice.org/38853
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
diff --git a/helpcontent2 b/helpcontent2
index c5180610e705..e24e053c82ad 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c5180610e70541db0c684fa29100c66355b8bfc2
+Subproject commit e24e053c82ad4ee86dd7eb4e9490c9c62af2b291
commit 5c81adc51a05a016e754de7961d3a7bdb4494e01
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Jun 16 00:18:57 2017 +0300
Get rid of the index inside FormulaTokenArray
Instead, use FormulaTokenArrrayPlainIterator everywhere, especially in
the FormulaCompiler.
This is the final step of a long chain of commits. (Split up into many
"uncontroversial" bits, and then this, to make potential bisecting
easier.)
Also added a logging operator<< for FormulaTokenArray, for SAL_DEBUG,
SAL_INFO etc goodness.
Change-Id: I02fe29f3f1e0dc33e5cba69e594223b4178a12bc
Reviewed-on: https://gerrit.libreoffice.org/38851
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 7da75874ea04..310ddb2346f3 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -700,6 +700,7 @@ FormulaCompiler::FormulaCompiler( FormulaTokenArray& rArr )
:
nCurrentFactorParam(0),
pArr( &rArr ),
+ maArrIterator( rArr ),
pCode( nullptr ),
pStack( nullptr ),
eLastOp( ocPush ),
@@ -715,10 +716,13 @@ FormulaCompiler::FormulaCompiler( FormulaTokenArray& rArr )
{
}
+FormulaTokenArray FormulaCompiler::smDummyTokenArray;
+
FormulaCompiler::FormulaCompiler()
:
nCurrentFactorParam(0),
pArr( nullptr ),
+ maArrIterator( smDummyTokenArray ),
pCode( nullptr ),
pStack( nullptr ),
eLastOp( ocPush ),
@@ -1260,11 +1264,11 @@ bool FormulaCompiler::GetToken()
{
FormulaTokenRef pSpacesToken;
short nWasColRowName;
- if ( pArr->nIndex > 0 && pArr->pCode[ pArr->nIndex-1 ]->GetOpCode() == ocColRowName )
+ if ( maArrIterator.mnIndex > 0 && pArr->pCode[ maArrIterator.mnIndex-1 ]->GetOpCode() == ocColRowName )
nWasColRowName = 1;
else
nWasColRowName = 0;
- mpToken = pArr->Next();
+ mpToken = maArrIterator.Next();
while( mpToken && mpToken->GetOpCode() == ocSpaces )
{
// For significant whitespace remember last ocSpaces token. Usually
@@ -1274,7 +1278,7 @@ bool FormulaCompiler::GetToken()
nWasColRowName++;
if ( bAutoCorrect && !pStack )
CreateStringFromToken( aCorrectedFormula, mpToken.get() );
- mpToken = pArr->Next();
+ mpToken = maArrIterator.Next();
}
if ( bAutoCorrect && !pStack && mpToken )
CreateStringFromToken( aCorrectedSymbol, mpToken.get() );
@@ -1296,7 +1300,7 @@ bool FormulaCompiler::GetToken()
if ( nWasColRowName >= 2 && mpToken->GetOpCode() == ocColRowName )
{ // convert an ocSpaces to ocIntersect in RPN
mpLastToken = mpToken = new FormulaByteToken( ocIntersect );
- pArr->nIndex--; // we advanced to the second ocColRowName, step back
+ maArrIterator.mnIndex--; // we advanced to the second ocColRowName, step back
}
else if (pSpacesToken && FormulaGrammar::isExcelSyntax( meGrammar) &&
mpLastToken && mpToken &&
@@ -1306,7 +1310,7 @@ bool FormulaCompiler::GetToken()
// Let IntersectionLine() <- Factor() decide how to treat this,
// once the actual arguments are determined in RPN.
mpLastToken = mpToken = pSpacesToken;
- pArr->nIndex--; // step back from next non-spaces token
+ maArrIterator.mnIndex--; // step back from next non-spaces token
return true;
}
}
@@ -1494,7 +1498,7 @@ void FormulaCompiler::Factor()
else
SetError( FormulaError::PairExpected);
sal_uInt8 nSepCount = 0;
- const sal_uInt16 nSepPos = pArr->nIndex - 1; // separator position, if any
+ const sal_uInt16 nSepPos = maArrIterator.mnIndex - 1; // separator position, if any
if( !bNoParam )
{
nSepCount++;
@@ -1521,12 +1525,13 @@ void FormulaCompiler::Factor()
// Current index is nSepPos+3 if expression stops, or
// nSepPos+4 if expression continues after the call because
// we just called NextToken() to move away from it.
- if (pc >= 2 && (pArr->nIndex == nSepPos + 3 || pArr->nIndex == nSepPos + 4) &&
+ if (pc >= 2 && (maArrIterator.mnIndex == nSepPos + 3 || maArrIterator.mnIndex == nSepPos + 4) &&
pArr->pCode[nSepPos+1]->GetType() == svDouble &&
pArr->pCode[nSepPos+1]->GetDouble() != 1.0 &&
pArr->pCode[nSepPos+2]->GetOpCode() == ocClose &&
pArr->RemoveToken( nSepPos, 2) == 2)
{
+ maArrIterator.AfterRemoveToken( nSepPos, 2);
// Remove the ocPush/svDouble just removed also from
// the compiler local RPN array.
--pCode; --pc;
@@ -1783,7 +1788,7 @@ void FormulaCompiler::IntersectionLine()
RangeLine();
while (mpToken->GetOpCode() == ocIntersect || mpToken->GetOpCode() == ocSpaces)
{
- sal_uInt16 nCodeIndex = pArr->nIndex - 1;
+ sal_uInt16 nCodeIndex = maArrIterator.mnIndex - 1;
FormulaToken** pCode1 = pCode - 1;
FormulaTokenRef p = mpToken;
NextToken();
@@ -1984,6 +1989,7 @@ bool FormulaCompiler::CompileTokenArray()
aCorrectedSymbol.clear();
}
pArr->DelRPN();
+ maArrIterator.Reset();
pStack = nullptr;
FormulaToken* pData[ FORMULA_MAXTOKENS ];
pCode = pData;
@@ -1994,7 +2000,7 @@ bool FormulaCompiler::CompileTokenArray()
aCorrectedFormula = "=";
}
pArr->ClearRecalcMode();
- pArr->Reset();
+ maArrIterator.Reset();
eLastOp = ocOpen;
pc = 0;
NextToken();
@@ -2021,6 +2027,7 @@ bool FormulaCompiler::CompileTokenArray()
if (pArr->GetCodeError() != FormulaError::NONE && mbStopOnError)
{
pArr->DelRPN();
+ maArrIterator.Reset();
pArr->SetHyperLink( false);
}
@@ -2049,6 +2056,8 @@ void FormulaCompiler::PopTokenArray()
if( p->bTemp )
delete pArr;
pArr = p->pArr;
+ maArrIterator = FormulaTokenArrayPlainIterator(*pArr);
+ maArrIterator.Jump(p->nIndex);
mpLastToken = p->mpLastToken;
delete p;
}
@@ -2068,20 +2077,27 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
return;
FormulaTokenArray* pSaveArr = pArr;
+ int nSaveIndex = maArrIterator.GetIndex();
bool bODFF = FormulaGrammar::isODFF( meGrammar);
if (bODFF || FormulaGrammar::isPODF( meGrammar) )
{
// Scan token array for missing args and re-write if present.
MissingConventionODF aConv( bODFF);
if (pArr->NeedsPodfRewrite( aConv))
+ {
pArr = pArr->RewriteMissing( aConv );
+ maArrIterator = FormulaTokenArrayPlainIterator( *pArr );
+ }
}
else if ( FormulaGrammar::isOOXML( meGrammar ) )
{
// Scan token array for missing args and rewrite if present.
MissingConventionOOXML aConv;
if (pArr->NeedsOoxmlRewrite())
+ {
pArr = pArr->RewriteMissing( aConv );
+ maArrIterator = FormulaTokenArrayPlainIterator( *pArr );
+ }
}
// At least one character per token, plus some are references, some are
@@ -2090,7 +2106,7 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
if ( pArr->IsRecalcModeForced() )
rBuffer.append( '=');
- const FormulaToken* t = pArr->First();
+ const FormulaToken* t = maArrIterator.First();
while( t )
t = CreateStringFromToken( rBuffer, t, true );
@@ -2098,6 +2114,8 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
{
delete pArr;
pArr = pSaveArr;
+ maArrIterator = FormulaTokenArrayPlainIterator( *pArr );
+ maArrIterator.Jump(nSaveIndex);
}
}
@@ -2120,9 +2138,9 @@ const FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuf
{
// AND, OR infix?
if ( bAllowArrAdvance )
- t = pArr->Next();
+ t = maArrIterator.Next();
else
- t = pArr->PeekNext();
+ t = maArrIterator.PeekNext();
bNext = false;
bSpaces = ( !t || t->GetOpCode() != ocOpen );
}
@@ -2134,11 +2152,11 @@ const FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuf
bool bIntersectionOp = mxSymbols->isODFF();
if (bIntersectionOp)
{
- const FormulaToken* p = pArr->PeekPrevNoSpaces();
+ const FormulaToken* p = maArrIterator.PeekPrevNoSpaces();
bIntersectionOp = (p && p->GetOpCode() == ocColRowName);
if (bIntersectionOp)
{
- p = pArr->PeekNextNoSpaces();
+ p = maArrIterator.PeekNextNoSpaces();
bIntersectionOp = (p && p->GetOpCode() == ocColRowName);
}
}
@@ -2208,13 +2226,13 @@ const FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuf
{
// Suppress all TableRef related tokens, the resulting
// range was written by CreateStringFromIndex().
- const FormulaToken* const p = pArr->PeekNext();
+ const FormulaToken* const p = maArrIterator.PeekNext();
if (p && p->GetOpCode() == ocTableRefOpen)
{
int nLevel = 0;
do
{
- t = pArr->Next();
+ t = maArrIterator.Next();
if (!t)
break;
@@ -2284,7 +2302,7 @@ const FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuf
if ( bAllowArrAdvance )
{
if( bNext )
- t = pArr->Next();
+ t = maArrIterator.Next();
return t;
}
return pTokenP;
@@ -2457,10 +2475,10 @@ OpCode FormulaCompiler::NextToken()
{
// Fake an intersection op as last op for the next round, but at
// least roughly check if it could make sense at all.
- FormulaToken* pPrev = pArr->PeekPrevNoSpaces();
+ FormulaToken* pPrev = maArrIterator.PeekPrevNoSpaces();
if (pPrev && isPotentialRangeType( pPrev, false, false))
{
- FormulaToken* pNext = pArr->PeekNextNoSpaces();
+ FormulaToken* pNext = maArrIterator.PeekNextNoSpaces();
if (pNext && isPotentialRangeType( pNext, false, true))
eLastOp = ocIntersect;
else
@@ -2610,10 +2628,12 @@ void FormulaCompiler::PushTokenArray( FormulaTokenArray* pa, bool bTemp )
FormulaArrayStack* p = new FormulaArrayStack;
p->pNext = pStack;
p->pArr = pArr;
+ p->nIndex = maArrIterator.GetIndex();
p->mpLastToken = mpLastToken;
p->bTemp = bTemp;
pStack = p;
pArr = pa;
+ maArrIterator = FormulaTokenArrayPlainIterator( *pArr );
}
} // namespace formula
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 1e966f1a40f1..78c69ea7360a 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -456,134 +456,6 @@ bool FormulaTokenArray::Fill(
}
return bError;
}
-FormulaToken* FormulaTokenArray::GetNextReference()
-{
- while( nIndex < nLen )
- {
- FormulaToken* t = pCode[ nIndex++ ];
- switch( t->GetType() )
- {
- case svSingleRef:
- case svDoubleRef:
- case svExternalSingleRef:
- case svExternalDoubleRef:
- return t;
- default:
- {
- // added to avoid warnings
- }
- }
- }
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::GetNextColRowName()
-{
- while( nIndex < nLen )
- {
- FormulaToken* t = pCode[ nIndex++ ];
- if ( t->GetOpCode() == ocColRowName )
- return t;
- }
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::GetNextReferenceRPN()
-{
- while( nIndex < nRPN )
- {
- FormulaToken* t = pRPN[ nIndex++ ];
- switch( t->GetType() )
- {
- case svSingleRef:
- case svDoubleRef:
- case svExternalSingleRef:
- case svExternalDoubleRef:
- return t;
- default:
- {
- // added to avoid warnings
- }
- }
- }
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::GetNextReferenceOrName()
-{
- if( pCode )
- {
- while ( nIndex < nLen )
- {
- FormulaToken* t = pCode[ nIndex++ ];
- switch( t->GetType() )
- {
- case svSingleRef:
- case svDoubleRef:
- case svIndex:
- case svExternalSingleRef:
- case svExternalDoubleRef:
- case svExternalName:
- return t;
- default:
- {
- // added to avoid warnings
- }
- }
- }
- }
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::GetNextName()
-{
- if( pCode )
- {
- while ( nIndex < nLen )
- {
- FormulaToken* t = pCode[ nIndex++ ];
- if( t->GetType() == svIndex )
- return t;
- }
- } // if( pCode )
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::Next()
-{
- if( pCode && nIndex < nLen )
- return pCode[ nIndex++ ];
- else
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::NextNoSpaces()
-{
- if( pCode )
- {
- while( (nIndex < nLen) && (pCode[ nIndex ]->GetOpCode() == ocSpaces) )
- ++nIndex;
- if( nIndex < nLen )
- return pCode[ nIndex++ ];
- }
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::NextRPN()
-{
- if( pRPN && nIndex < nRPN )
- return pRPN[ nIndex++ ];
- else
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::PrevRPN()
-{
- if( pRPN && nIndex )
- return pRPN[ --nIndex ];
- else
- return nullptr;
-}
void FormulaTokenArray::DelRPN()
{
@@ -597,7 +469,7 @@ void FormulaTokenArray::DelRPN()
delete [] pRPN;
}
pRPN = nullptr;
- nRPN = nIndex = 0;
+ nRPN = 0;
}
FormulaToken* FormulaTokenArray::FirstToken() const
@@ -614,46 +486,6 @@ FormulaToken* FormulaTokenArray::PeekPrev( sal_uInt16 & nIdx )
return nullptr;
}
-FormulaToken* FormulaTokenArray::PeekNext()
-{
- if( pCode && nIndex < nLen )
- return pCode[ nIndex ];
- else
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::PeekNextNoSpaces()
-{
- if( pCode && nIndex < nLen )
- {
- sal_uInt16 j = nIndex;
- while ( j < nLen && pCode[j]->GetOpCode() == ocSpaces )
- j++;
- if ( j < nLen )
- return pCode[ j ];
- else
- return nullptr;
- }
- else
- return nullptr;
-}
-
-FormulaToken* FormulaTokenArray::PeekPrevNoSpaces()
-{
- if( pCode && nIndex > 1 )
- {
- sal_uInt16 j = nIndex - 2;
- while ( pCode[j]->GetOpCode() == ocSpaces && j > 0 )
- j--;
- if ( j > 0 || pCode[j]->GetOpCode() != ocSpaces )
- return pCode[ j ];
- else
- return nullptr;
- }
- else
- return nullptr;
-}
-
FormulaToken* FormulaTokenArray::FirstRPNToken() const
{
if (!pRPN || nRPN == 0)
@@ -737,7 +569,6 @@ FormulaTokenArray::FormulaTokenArray() :
pRPN(nullptr),
nLen(0),
nRPN(0),
- nIndex(0),
nError(FormulaError::NONE),
nMode(ScRecalcMode::NORMAL),
bHyperLink(false),
@@ -761,7 +592,6 @@ void FormulaTokenArray::Assign( const FormulaTokenArray& r )
{
nLen = r.nLen;
nRPN = r.nRPN;
- nIndex = r.nIndex;
nError = r.nError;
nMode = r.nMode;
bHyperLink = r.bHyperLink;
@@ -828,7 +658,7 @@ void FormulaTokenArray::Clear()
}
pCode = nullptr; pRPN = nullptr;
nError = FormulaError::NONE;
- nLen = nIndex = nRPN = 0;
+ nLen = nRPN = 0;
bHyperLink = false;
mbFromRangeName = false;
mbShareable = true;
@@ -924,13 +754,6 @@ sal_uInt16 FormulaTokenArray::RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount
}
nLen -= nCount;
- if (nIndex >= nOffset)
- {
- if (nIndex < nStop)
- nIndex = nOffset + 1;
- else
- nIndex -= nStop - nOffset;
- }
return nCount;
}
else
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index f6650201bba1..a9b65671e4cd 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -29,6 +29,7 @@
#include <formula/grammar.hxx>
#include <formula/opcode.hxx>
#include <formula/token.hxx>
+#include <formula/tokenarray.hxx>
#include <formula/types.hxx>
#include <formula/paramclass.hxx>
#include <rtl/ustrbuf.hxx>
@@ -53,12 +54,12 @@ enum class FormulaError : sal_uInt16;
namespace formula
{
- class FormulaTokenArray;
struct FormulaArrayStack
{
FormulaArrayStack* pNext;
FormulaTokenArray* pArr;
+ sal_uInt16 nIndex;
FormulaTokenRef mpLastToken;
bool bTemp;
};
@@ -331,6 +332,7 @@ protected:
FormulaTokenRef pCurrentFactorToken; // current factor token (of Factor() method)
sal_uInt16 nCurrentFactorParam; // current factor token's parameter, 1-based
FormulaTokenArray* pArr;
+ FormulaTokenArrayPlainIterator maArrIterator;
FormulaTokenRef mpLastToken; // last token
FormulaToken** pCode;
@@ -416,6 +418,8 @@ private:
mutable NonConstOpCodeMapPtr mxSymbolsEnglish; // English symbols
mutable NonConstOpCodeMapPtr mxSymbolsEnglishXL; // English Excel symbols (for VBA formula parsing)
mutable NonConstOpCodeMapPtr mxSymbolsOOXML; // Excel OOXML symbols
+
+ static FormulaTokenArray smDummyTokenArray;
};
} // formula
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 72cb0e5a400a..8a00c0287126 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -22,6 +22,7 @@
#include <climits>
#include <memory>
+#include <ostream>
#include <type_traits>
#include <unordered_set>
#include <unordered_map>
@@ -123,7 +124,6 @@ protected:
FormulaToken** pRPN; // RPN array
sal_uInt16 nLen; // Length of token array
sal_uInt16 nRPN; // Length of RPN array
- sal_uInt16 nIndex; // Current step index
FormulaError nError; // Error code
ScRecalcMode nMode; // Flags to indicate when to recalc this code
bool bHyperLink :1; // If HYPERLINK() occurs in the formula.
@@ -161,9 +161,7 @@ protected:
/** Remove a sequence of tokens from pCode array, and pRPN array if the
tokens are referenced there.
- This' nLen and nRPN are adapted, as is nIndex if it points behind
- nOffset. If nIndex points into the to be removed range
- (nOffset < nIndex < nOffset+nCount) it is set to nOffset+1.
+ nLen and nRPN are adapted.
@param nOffset
Start offset into pCode.
@@ -205,24 +203,10 @@ public:
void Clear();
void DelRPN();
- FormulaToken* First() { nIndex = 0; return Next(); }
FormulaToken* FirstToken() const;
- FormulaToken* Next();
- FormulaToken* NextNoSpaces();
- FormulaToken* GetNextName();
- FormulaToken* GetNextReference();
- FormulaToken* GetNextReferenceRPN();
- FormulaToken* GetNextReferenceOrName();
- FormulaToken* GetNextColRowName();
/// Peek at nIdx-1 if not out of bounds, decrements nIdx if successful. Returns NULL if not.
FormulaToken* PeekPrev( sal_uInt16 & nIdx );
- FormulaToken* PeekNext();
- FormulaToken* PeekPrevNoSpaces(); /// Only after Reset/First/Next/Last/Prev!
- FormulaToken* PeekNextNoSpaces(); /// Only after Reset/First/Next/Last/Prev!
FormulaToken* FirstRPNToken() const;
- FormulaToken* NextRPN();
- FormulaToken* LastRPN() { nIndex = nRPN; return PrevRPN(); }
- FormulaToken* PrevRPN();
bool HasReferences() const;
@@ -246,7 +230,6 @@ public:
FormulaToken** GetCode() const { return pRPN; }
sal_uInt16 GetLen() const { return nLen; }
sal_uInt16 GetCodeLen() const { return nRPN; }
- void Reset() { nIndex = 0; }
FormulaError GetCodeError() const { return nError; }
void SetCodeError( FormulaError n ) { nError = n; }
void SetHyperLink( bool bVal ) { bHyperLink = bVal; }
@@ -407,6 +390,22 @@ private:
const FormulaToken* GetNonEndOfPathToken( short nIdx ) const;
};
+// For use in SAL_INFO, SAL_WARN etc
+
+template<typename charT, typename traits>
+inline std::basic_ostream<charT, traits> & operator <<(std::basic_ostream<charT, traits> & stream, const FormulaTokenArray& point)
+{
+ stream <<
+ static_cast<const void*>(&point) <<
+ ":{nLen=" << point.GetLen() <<
+ ",nRPN=" << point.GetCodeLen() <<
+ ",pCode=" << static_cast<void*>(point.GetArray()) <<
+ ",pRPN=" << static_cast<void*>(point.GetCode()) <<
+ "}";
+
+ return stream;
+}
+
class FORMULA_DLLPUBLIC FormulaTokenArrayPlainIterator
{
friend class FormulaCompiler;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 943c89dcc960..50775af00b57 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4361,6 +4361,7 @@ ScTokenArray* ScCompiler::CompileString( const OUString& rFormula )
ScTokenArray aArr;
pArr = &aArr;
+ maArrIterator = FormulaTokenArrayPlainIterator(*pArr);
aFormula = comphelper::string::strip(rFormula, ' ');
nSrcPos = 0;
@@ -4645,6 +4646,7 @@ ScTokenArray* ScCompiler::CompileString( const OUString& rFormula )
ScTokenArray* pNew = new ScTokenArray( aArr );
pNew->GenHash();
pArr = pNew;
+ maArrIterator = FormulaTokenArrayPlainIterator(*pArr);
if (!maExternalFiles.empty())
{
@@ -4675,6 +4677,7 @@ ScTokenArray* ScCompiler::CompileString( const OUString& rFormula, const OUStrin
// remember pArr, in case a subsequent CompileTokenArray() is executed.
ScTokenArray* pNew = new ScTokenArray( aTokenArray );
pArr = pNew;
+ maArrIterator = FormulaTokenArrayPlainIterator(*pArr);
return pNew;
}
}
@@ -4707,8 +4710,8 @@ bool ScCompiler::HandleRange()
// or if not directly between ocSep/parenthesis,
// e.g. SUM(...;(...;...)) no, SUM(...;(...)*3) yes,
// in short: if it isn't a self-contained expression.
- FormulaToken* p1 = pArr->PeekPrevNoSpaces();
- FormulaToken* p2 = pArr->PeekNextNoSpaces();
+ FormulaToken* p1 = maArrIterator.PeekPrevNoSpaces();
+ FormulaToken* p2 = maArrIterator.PeekNextNoSpaces();
OpCode eOp1 = (p1 ? p1->GetOpCode() : ocSep);
OpCode eOp2 = (p2 ? p2->GetOpCode() : ocSep);
bool bBorder1 = (eOp1 == ocSep || eOp1 == ocOpen);
@@ -4719,7 +4722,6 @@ bool ScCompiler::HandleRange()
pNew = new ScTokenArray();
pNew->AddOpCode( ocClose );
PushTokenArray( pNew, true );
- pNew->Reset();
}
pNew = pRangeData->GetCode()->Clone();
pNew->SetFromRangeName( true );
@@ -4737,13 +4739,12 @@ bool ScCompiler::HandleRange()
SetRelNameReference();
MoveRelWrap(pRangeData->GetMaxCol(), pRangeData->GetMaxRow());
}
- pNew->Reset();
+ maArrIterator.Reset();
if ( bAddPair )
{
pNew = new ScTokenArray();
pNew->AddOpCode( ocOpen );
PushTokenArray( pNew, true );
- pNew->Reset();
}
return GetToken();
}
@@ -4755,7 +4756,6 @@ bool ScCompiler::HandleRange()
pNew = new ScTokenArray;
pNew->Add( new FormulaErrorToken( FormulaError::NoName));
PushTokenArray( pNew, true );
- pNew->Reset();
return GetToken();
}
return true;
@@ -4791,12 +4791,12 @@ bool ScCompiler::HandleExternalReference(const FormulaToken& _aToken)
ScTokenArray* pNew = xNew->Clone();
PushTokenArray( pNew, true);
- if (pNew->GetNextReference() != nullptr)
+ if (FormulaTokenArrayPlainIterator(*pNew).GetNextReference() != nullptr)
{
SetRelNameReference();
MoveRelWrap(MAXCOL, MAXROW);
}
- pNew->Reset();
+ maArrIterator.Reset();
return GetToken();
}
default:
@@ -4808,8 +4808,8 @@ bool ScCompiler::HandleExternalReference(const FormulaToken& _aToken)
void ScCompiler::AdjustSheetLocalNameRelReferences( SCTAB nDelta )
{
- pArr->Reset();
- for (formula::FormulaToken* t = pArr->GetNextReference(); t; t = pArr->GetNextReference())
+ maArrIterator.Reset();
+ for (formula::FormulaToken* t = maArrIterator.GetNextReference(); t; t = maArrIterator.GetNextReference())
{
ScSingleRefData& rRef1 = *t->GetSingleRef();
if (rRef1.IsTabRel())
@@ -4827,9 +4827,9 @@ void ScCompiler::AdjustSheetLocalNameRelReferences( SCTAB nDelta )
void ScCompiler::SetRelNameReference()
{
- pArr->Reset();
- for( formula::FormulaToken* t = pArr->GetNextReference(); t;
- t = pArr->GetNextReference() )
+ maArrIterator.Reset();
+ for( formula::FormulaToken* t = maArrIterator.GetNextReference(); t;
+ t = maArrIterator.GetNextReference() )
{
ScSingleRefData& rRef1 = *t->GetSingleRef();
if ( rRef1.IsColRel() || rRef1.IsRowRel() || rRef1.IsTabRel() )
@@ -4847,9 +4847,9 @@ void ScCompiler::SetRelNameReference()
// don't call for other token arrays!
void ScCompiler::MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow )
{
- pArr->Reset();
- for( formula::FormulaToken* t = pArr->GetNextReference(); t;
- t = pArr->GetNextReference() )
+ maArrIterator.Reset();
+ for( formula::FormulaToken* t = maArrIterator.GetNextReference(); t;
+ t = maArrIterator.GetNextReference() )
{
if ( t->GetType() == svSingleRef || t->GetType() == svExternalSingleRef )
ScRefUpdate::MoveRelWrap( pDoc, aPos, nMaxCol, nMaxRow, SingleDoubleRefModifier( *t->GetSingleRef() ).Ref() );
@@ -4863,9 +4863,9 @@ void ScCompiler::MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow )
void ScCompiler::MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos,
SCCOL nMaxCol, SCROW nMaxRow )
{
- rArr.Reset();
- for( formula::FormulaToken* t = rArr.GetNextReference(); t;
- t = rArr.GetNextReference() )
+ formula::FormulaTokenArrayPlainIterator aIter(rArr);
+ for( formula::FormulaToken* t = aIter.GetNextReference(); t;
+ t = aIter.GetNextReference() )
{
if ( t->GetType() == svSingleRef || t->GetType() == svExternalSingleRef )
ScRefUpdate::MoveRelWrap( pDoc, rPos, nMaxCol, nMaxRow, SingleDoubleRefModifier( *t->GetSingleRef() ).Ref() );
@@ -5031,7 +5031,7 @@ void ScCompiler::CreateStringFromSingleRef( OUStringBuffer& rBuffer, const Formu
GetSetupTabNames(), aRef, true, (pArr && pArr->IsFromRangeName()));
}
}
- else if (pArr && (p = pArr->PeekPrevNoSpaces()) && p->GetOpCode() == ocTableRefOpen)
+ else if (pArr && (p = maArrIterator.PeekPrevNoSpaces()) && p->GetOpCode() == ocTableRefOpen)
{
OUString aStr;
ScAddress aAbs = rRef.toAbs(aPos);
@@ -5351,8 +5351,8 @@ bool ScCompiler::HandleColRowName()
bFound = true;
else
{
- FormulaToken* p1 = pArr->PeekPrevNoSpaces();
- FormulaToken* p2 = pArr->PeekNextNoSpaces();
+ FormulaToken* p1 = maArrIterator.PeekPrevNoSpaces();
+ FormulaToken* p2 = maArrIterator.PeekNextNoSpaces();
// begin/end of a formula => single
OpCode eOp1 = p1 ? p1->GetOpCode() : ocAdd;
OpCode eOp2 = p2 ? p2->GetOpCode() : ocAdd;
@@ -5422,7 +5422,6 @@ bool ScCompiler::HandleColRowName()
}
}
PushTokenArray( pNew, true );
- pNew->Reset();
return GetToken();
}
}
@@ -5447,7 +5446,6 @@ bool ScCompiler::HandleDbData()
ScTokenArray* pNew = new ScTokenArray();
pNew->AddDoubleReference( aRefData );
PushTokenArray( pNew, true );
- pNew->Reset();
return GetToken();
}
return true;
@@ -5455,7 +5453,7 @@ bool ScCompiler::HandleDbData()
bool ScCompiler::GetTokenIfOpCode( OpCode eOp )
{
- const formula::FormulaToken* p = pArr->PeekNextNoSpaces();
+ const formula::FormulaToken* p = maArrIterator.PeekNextNoSpaces();
if (p && p->GetOpCode() == eOp)
return GetToken();
return false;
@@ -5590,7 +5588,7 @@ bool ScCompiler::HandleTableRef()
} eState = sOpen;
do
{
- const formula::FormulaToken* p = pArr->PeekNextNoSpaces();
+ const formula::FormulaToken* p = maArrIterator.PeekNextNoSpaces();
if (!p)
eState = sStop;
else
@@ -5762,7 +5760,6 @@ bool ScCompiler::HandleTableRef()
SetError( FormulaError::Pair);
}
PushTokenArray( pNew, true );
- pNew->Reset();
return GetToken();
}
return true;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 37c9db979aec..6b5247b0889b 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1296,7 +1296,8 @@ void ScInterpreter::GetExternalDoubleRef(
return;
}
- formula::FormulaToken* pToken = pArray->First();
+ formula::FormulaTokenArrayPlainIterator aIter(*pArray);
+ formula::FormulaToken* pToken = aIter.First();
if (pToken->GetType() == svError)
{
SetError( pToken->GetError());
@@ -1308,7 +1309,7 @@ void ScInterpreter::GetExternalDoubleRef(
return;
}
- if (pArray->Next())
+ if (aIter.Next())
{
// Can't handle more than one matrix per parameter.
SetError( FormulaError::IllegalArgument);
commit 468fc3847cfd65217949630e2ffd9fb0a89e9cbb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 16 11:54:17 2017 +0200
Work around GCC derivates with two-section 'gcc -dumpversion' output
...as happens e.g. with /usr/bin/gcc "gcc (SUSE Linux) 4.8.5" on
gandalf.documentfoundation.org, reporting "4.8" instead of "4.8.5" (and thus
failing since 579497164f6bddfeb14bb6b0f4b9cd3322af1803 "Bump GCC baseline to
4.8.1", e.g., <https://ci.libreoffice.org/job/lo_tb_master_linux/18923/>).
Keep it simple and assume that the micro would be at least 1 when missing...
Change-Id: I096dd6671ad012e5bf890d3bf510780661f62d24
diff --git a/configure.ac b/configure.ac
index 15272b766644..9ebf25de6efd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3781,7 +3781,7 @@ if test "$GCC" = "yes" -a -z "$COM_IS_CLANG"; then
AC_MSG_CHECKING([the GCC version])
_gcc_version=`$CC -dumpversion`
gcc_full_version=$(printf '%s' "$_gcc_version" | \
- $AWK -F. '{ print $1*10000+$2*100+$3 }')
+ $AWK -F. '{ print $1*10000+$2*100+(NF<3?1:$3) }')
GCC_VERSION=`echo $_gcc_version | $AWK -F. '{ print \$1*100+\$2 }'`
AC_MSG_RESULT([gcc $_gcc_version ($gcc_full_version)])
commit 99cc2f32060f8e2f7f732b65122771c2a61638ca
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 16 09:46:14 2017 +0100
only some languages put a space between number and %
Change-Id: I9dbbf403624a49513e4c596aef80754cd4e0a88d
Reviewed-on: https://gerrit.libreoffice.org/38867
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 4c58847a33c1..7b45fdadd62c 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -19,6 +19,7 @@
#include <string>
+#include <i18nutil/unicode.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
@@ -92,7 +93,7 @@ ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString&
maCommand( rCmd ),
mxFrame( rFrame )
{
- Size aSize(CalcMinimumSizeForText("-100 %"));
+ Size aSize(CalcMinimumSizeForText(unicode::formatPercent(-100, Application::GetSettings().GetUILanguageTag())));
SetSizePixel(aSize);
if ( maCommand == ".uno:GrafGamma" )
commit 9e4502f0e393d2bc2810488b3ebb0a5c23038436
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 16 09:42:47 2017 +0100
Resolves: tdf#108419 use spinfield preferred size as transparency widget size
Change-Id: I7b5c8aeb087efe007c687dc1f206bcb0e8b0173e
Reviewed-on: https://gerrit.libreoffice.org/38864
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 2a20d011028e..4c58847a33c1 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -92,11 +92,8 @@ ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString&
maCommand( rCmd ),
mxFrame( rFrame )
{
- Size aSize( GetTextWidth( "-100 %" ), GetTextHeight() );
-
- aSize.Width() += 20;
- aSize.Height() += 6;
- SetSizePixel( aSize );
+ Size aSize(CalcMinimumSizeForText("-100 %"));
+ SetSizePixel(aSize);
if ( maCommand == ".uno:GrafGamma" )
{
commit 579497164f6bddfeb14bb6b0f4b9cd3322af1803
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 16 09:46:39 2017 +0200
Bump GCC baseline to 4.8.1
see <https://lists.freedesktop.org/archives/libreoffice/2017-June/077909.html>
"Re: Some baseline thoughts" and
<https://lists.freedesktop.org/archives/libreoffice/2017-June/077910.html>
"minutes of ESC call ..."
Change-Id: I09fb8dc228c23a39e7e332742095b0e2dfce711d
Reviewed-on: https://gerrit.libreoffice.org/38860
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/configure.ac b/configure.ac
index e82c61d86424..15272b766644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3780,12 +3780,14 @@ dnl ===================================================================
if test "$GCC" = "yes" -a -z "$COM_IS_CLANG"; then
AC_MSG_CHECKING([the GCC version])
_gcc_version=`$CC -dumpversion`
+ gcc_full_version=$(printf '%s' "$_gcc_version" | \
+ $AWK -F. '{ print $1*10000+$2*100+$3 }')
GCC_VERSION=`echo $_gcc_version | $AWK -F. '{ print \$1*100+\$2 }'`
- AC_MSG_RESULT([gcc $_gcc_version])
+ AC_MSG_RESULT([gcc $_gcc_version ($gcc_full_version)])
- if test "$GCC_VERSION" -lt 0407; then
- AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 4.7.0])
+ if test "$gcc_full_version" -lt 40801; then
+ AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 4.8.1])
fi
else
# Explicitly force GCC_VERSION to be empty, even for Clang, to check incorrect uses.
commit fcd12c6d8574c1cd4c6ff45ba54e5d286d42eaad
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Fri Jun 16 08:56:07 2017 +0200
tdf#108486 Only apply hyperlink settings if something did change
Change-Id: Idc601e9ca4ac3ea429d3b514ad6af4198954ca33
Reviewed-on: https://gerrit.libreoffice.org/38859
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index c66be6d84d56..85e5155d4525 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -169,7 +169,9 @@ SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
::FillCharStyleListBox(*m_pVisitedLB, pView->GetDocShell());
::FillCharStyleListBox(*m_pNotVisitedLB, pView->GetDocShell());
m_pVisitedLB->SelectEntryPos(m_pVisitedLB->GetEntryPos(reinterpret_cast<void*>(RES_POOLCHR_INET_VISIT)));
+ m_pVisitedLB->SaveValue();
m_pNotVisitedLB->SelectEntryPos(m_pNotVisitedLB->GetEntryPos(reinterpret_cast<void*>(RES_POOLCHR_INET_NORMAL)));
+ m_pNotVisitedLB->SaveValue();
std::unique_ptr<TargetList> pList( new TargetList );
const SfxFrame& rFrame = pView->GetViewFrame()->GetFrame();
commit 0c1fdff3efbb16836d679923828ebd7dda03b937
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 15 21:15:42 2017 +0100
Resolves: tdf#75788 build jpeg-turbo without --with-jpeg8
Change-Id: I3da1559bd3434d574db65a3b492e1060c46143ee
Reviewed-on: https://gerrit.libreoffice.org/38849
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
index 595f4ea9a3fc..f3e3945caf99 100644
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
@@ -30,7 +30,6 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
--with-pic \
--enable-static \
--disable-shared \
- --with-jpeg8 \
--without-java \
--without-turbojpeg \
$(if $(NASM),,--without-simd) \
commit 5ac1d27d0bca285047f291e0a475f8bb99134cea
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 16 09:19:05 2017 +0200
CPPUNIT_ASSERT_EQUAL type-mismatch
Change-Id: Icd115383970d351ed8b224bbbd18e98ae0cc8f0d
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index e0e6255b6c6d..b4c79b1b048c 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -752,7 +752,7 @@ DECLARE_ODFEXPORT_TEST(testTdf103091, "tdf103091.fodt")
"Conditional"), uno::UNO_QUERY);
auto conditions(getProperty<uno::Sequence<beans::NamedValue>>(xStyle1, "ParaStyleConditions"));
- CPPUNIT_ASSERT_EQUAL(28, conditions.getLength());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(28), conditions.getLength());
CPPUNIT_ASSERT_EQUAL(OUString("TableHeader"), conditions[0].Name);
CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Addressee")), conditions[0].Value);
CPPUNIT_ASSERT_EQUAL(OUString("Table"), conditions[1].Name);
commit a975624bfeeb08670b90944eda372d6d4755ae34
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jun 15 16:02:03 2017 +0200
loplugin:unusedfields in tools..vbahelper
Change-Id: Ief7d4c8e1866604eda6308ea2a5c1ce4b1c093bc
Reviewed-on: https://gerrit.libreoffice.org/38836
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 6d98f4997e3a..5c464ae05c9a 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -73,11 +73,9 @@ struct ImpRCStack
RCFlags Flags; ///< resource status
void * aResHandle; ///< Resource-Identifier from InternalResMgr
const Resource* pResObj; ///< pointer to Resource object
- sal_uInt32 nId; ///< ResId used for error message
- ResMgr* pResMgr; ///< ResMgr for Resource pResObj
void Clear();
- void Init( ResMgr * pMgr, const Resource * pObj, sal_uInt32 nId );
+ void Init( const Resource * pObj, sal_uInt32 nId );
};
class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ResMgr
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 4b7765dc09d0..b47d150aca29 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -574,7 +574,9 @@ class TOOLS_DLLPUBLIC SvFileStream : public SvStream
private:
StreamData* pInstanceData;
OUString aFilename;
+#if defined(_WIN32)
sal_uInt16 nLockCounter;
+#endif
bool bIsOpen;
SvFileStream (const SvFileStream&) = delete;
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 07cd1ad629a8..7c2a5f565cad 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -316,7 +316,6 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication :
OUString m_aAccount;
css::ucb::RememberAuthentication m_eRememberPasswordMode;
css::ucb::RememberAuthentication m_eDefaultRememberPasswordMode;
- css::ucb::RememberAuthentication m_eRememberAccountMode;
css::ucb::RememberAuthentication m_eDefaultRememberAccountMode;
bool m_bCanSetRealm : 1;
bool m_bCanSetUserName : 1;
@@ -481,7 +480,6 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
m_aRememberAccountModes( rRememberAccountModes ),
m_eRememberPasswordMode( eDefaultRememberPasswordMode ),
m_eDefaultRememberPasswordMode( eDefaultRememberPasswordMode ),
- m_eRememberAccountMode( eDefaultRememberAccountMode ),
m_eDefaultRememberAccountMode( eDefaultRememberAccountMode ),
m_bCanSetRealm( bCanSetRealm ),
m_bCanSetUserName( bCanSetUserName ),
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 3d3d2dd89048..3e808571923e 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -725,15 +725,13 @@ static void RscException_Impl()
}
}
-void ImpRCStack::Init( ResMgr* pMgr, const Resource* pObj, sal_uInt32 Id )
+void ImpRCStack::Init( const Resource* pObj, sal_uInt32 Id )
{
pResource = nullptr;
pClassRes = nullptr;
Flags = RCFlags::NONE;
aResHandle = nullptr;
pResObj = pObj;
- nId = Id & ~RSC_DONTRELEASE; //TLX: Besser Init aendern
- pResMgr = pMgr;
if ( !(Id & RSC_DONTRELEASE) )
Flags |= RCFlags::AUTORELEASE;
}
@@ -745,8 +743,6 @@ void ImpRCStack::Clear()
Flags = RCFlags::NONE;
aResHandle = nullptr;
pResObj = nullptr;
- nId = 0;
- pResMgr = nullptr;
}
static RSHEADER_TYPE* LocalResource( const ImpRCStack* pStack,
@@ -966,7 +962,7 @@ bool ResMgr::GetResource( const ResId& rId, const Resource* pResObj )
incStack();
pTop = &aStack[nCurStack];
- pTop->Init( pMgr, pResObj, nId |
+ pTop->Init( pResObj, nId |
(rId.IsAutoRelease() ? 0 : RSC_DONTRELEASE) );
if ( pClassRes )
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 46d0bb79c9dc..bb5d3de9fff7 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -272,7 +272,6 @@ static sal_uInt32 GetSvError( oslFileError nErrno )
SvFileStream::SvFileStream( const OUString& rFileName, StreamMode nOpenMode )
{
bIsOpen = false;
- nLockCounter = 0;
m_isWritable = false;
pInstanceData = new StreamData;
@@ -290,7 +289,6 @@ SvFileStream::SvFileStream( const OUString& rFileName, StreamMode nOpenMode )
SvFileStream::SvFileStream()
{
bIsOpen = false;
- nLockCounter = 0;
m_isWritable = false;
pInstanceData = new StreamData;
SetBufferSize( 1024 );
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index e660153807c4..08b857590b9e 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
@@ -48,13 +48,11 @@ void SAL_CALL XInteractionApproveImpl::select()
// XInteractionDisapproveImpl
XInteractionDisapproveImpl::XInteractionDisapproveImpl()
- : m_bSelected(false)
{
}
void SAL_CALL XInteractionDisapproveImpl::select()
{
- m_bSelected = true;
}
// XInteractionRequestImpl
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 50356454f05f..04b57de82aed 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -58,10 +58,6 @@ namespace ftp {
XInteractionDisapproveImpl();
virtual void SAL_CALL select() override;
-
- private:
-
- bool m_bSelected;
};
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 9f4119c8bdb7..edb7010aeaad 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -644,9 +644,8 @@ InteractionSupplyAuthentication::getRememberAccountModes(
// virtual
void SAL_CALL InteractionSupplyAuthentication::setRememberAccount(
- ucb::RememberAuthentication Remember )
+ ucb::RememberAuthentication )
{
- m_eRememberAccountMode = Remember;
}
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index fccc785a2003..0d680c304d27 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -98,7 +98,6 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
OUString m_aExtensionPropName;
SvtExtendedSecurityOptions::OpenHyperlinkMode m_eOpenHyperlinkMode;
- bool m_bROOpenHyperlinkMode;
ExtensionHashMap m_aExtensionHashMap;
};
@@ -110,7 +109,6 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
, m_aSecureExtensionsSetName( SECURE_EXTENSIONS_SET )
, m_aExtensionPropName( EXTENSION_PROPNAME )
, m_eOpenHyperlinkMode(SvtExtendedSecurityOptions::OPEN_NEVER)
- , m_bROOpenHyperlinkMode(false)
// Init member then.
{
// Fill the extension hash map with all secure extension strings
@@ -118,7 +116,6 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
Sequence< OUString > seqNames = GetPropertyNames();
Sequence< Any > seqValues = GetProperties( seqNames );
- Sequence< sal_Bool > seqRO = GetReadOnlyStates ( seqNames );
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
@@ -138,7 +135,6 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
else {
OSL_FAIL("Wrong type for Open mode!");
}
- m_bROOpenHyperlinkMode = seqRO[nProperty];
}
break;
}
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 006e5c7fe086..5f3530395bfe 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -180,7 +180,6 @@ namespace DOM
// context struct passed to IO functions
typedef struct context {
- CDocumentBuilder *pBuilder;
Reference< XInputStream > rInputStream;
bool close;
bool freeOnClose;
@@ -247,7 +246,6 @@ namespace DOM
// when IO is actually performed through the callbacks. The close function must
// free the memory which is indicated by the freeOnClose field in the context struct
context_t *c = new context_t;
- c->pBuilder = builder;
c->rInputStream = src.aInputStream;
c->close = true;
c->freeOnClose = true;
@@ -316,7 +314,6 @@ namespace DOM
// IO context struct. Must outlive pContext, as destroying that via
// xmlFreeParserCtxt may still access this context_t
context_t c;
- c.pBuilder = this;
c.rInputStream = is;
// we did not open the stream, thus we do not close it.
c.close = false;
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 0906439c1e04..1c8e50d6632f 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -124,7 +124,7 @@ ScVbaControlListener::disposing( const lang::EventObject& )
//ScVbaControl
-ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ControlImpl_BASE( xParent, xContext ), bIsDialog(false), m_xControl( xControl ), m_xModel( xModel )
+ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ControlImpl_BASE( xParent, xContext ), m_xControl( xControl ), m_xModel( xModel )
{
//add listener
m_xEventListener.set( new ScVbaControlListener( this ) );
@@ -146,7 +146,6 @@ ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, c
else if ( xUserFormControl.is() ) // userform control
{
m_xProps.set( xUserFormControl->getModel(), uno::UNO_QUERY_THROW );
- bIsDialog = true;
}
}
diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx
index 51bcb958480d..66bebf5acad5 100644
--- a/vbahelper/source/msforms/vbacontrol.hxx
+++ b/vbahelper/source/msforms/vbacontrol.hxx
@@ -44,7 +44,6 @@ protected:
// whether it is necessary is another question
OUString m_aControlTag;
- bool bIsDialog;
OUString m_sLibraryAndCodeName;
std::unique_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper;
css::uno::Reference< css::beans::XPropertySet > m_xProps;
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index cfc89c70abd8..f69bcf822d9a 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -24,7 +24,7 @@
using namespace com::sun::star;
using namespace ooo::vba;
-ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( 0 ), m_bTemporary( true )
+ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( 0 )
{
}
@@ -200,12 +200,10 @@ ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelp
const VbaCommandBarHelperRef& pHelper,
const css::uno::Reference< css::container::XIndexAccess >& xBarSettings,
const OUString& sResourceUrl,
- sal_Int32 nPosition,
- bool bTemporary )
+ sal_Int32 nPosition )
: CommandBarPopup_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
{
m_nPosition = nPosition;
- m_bTemporary = bTemporary;
m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues;
}
@@ -234,12 +232,10 @@ ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHe
const VbaCommandBarHelperRef& pHelper,
const css::uno::Reference< css::container::XIndexAccess >& xBarSettings,
const OUString& sResourceUrl,
- sal_Int32 nPosition,
- bool bTemporary )
+ sal_Int32 nPosition )
: CommandBarButton_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
{
m_nPosition = nPosition;
- m_bTemporary = bTemporary;
m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues;
}
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
index de5fdfc4d6af..348518b5ba2e 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
@@ -40,7 +40,6 @@ protected:
css::uno::Sequence< css::beans::PropertyValue > m_aPropertyValues;
sal_Int32 m_nPosition;
- bool m_bTemporary;
private:
/// @throws css::uno::RuntimeException
@@ -80,7 +79,7 @@ class ScVbaCommandBarPopup : public CommandBarPopup_BASE
{
public:
/// @throws css::uno::RuntimeException
- ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, bool bTemporary );
+ ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition );
virtual sal_Int32 SAL_CALL getType() override
{
@@ -96,7 +95,7 @@ class ScVbaCommandBarButton : public CommandBarButton_BASE
{
public:
/// @throws css::uno::RuntimeException
- ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, bool bTemporary );
+ ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition );
virtual sal_Int32 SAL_CALL getType() override
{
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 9c0772c9c9da..1c4261f034f5 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -132,9 +132,9 @@ ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
getPropertyValue( aProps, ITEM_DESCRIPTOR_CONTAINER ) >>= xSubMenu;
ScVbaCommandBarControl* pNewCommandBarControl = nullptr;
if( xSubMenu.is() )
- pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, true );
+ pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition );
else
- pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, true );
+ pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition );
return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
}
@@ -227,9 +227,9 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
ScVbaCommandBarControl* pNewCommandBarControl = nullptr;
if( nType == office::MsoControlType::msoControlPopup )
- pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary );
+ pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition );
else
- pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary );
+ pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition );
return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
}
commit 83f9325f0d8d643d8b3e71fa3ff76ebbd599373d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jun 15 11:42:29 2017 +0200
loplugin:unusedfields xmlhelp..xmlsecurity
Change-Id: I7e680e1913c787ce0adad5be1f84668d57ad00b3
Reviewed-on: https://gerrit.libreoffice.org/38821
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 8c2f0067e8fa..85d33f8463a1 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -119,8 +119,6 @@ OUString const & URLParameter::get_id()
get_language() );
if( inf )
m_aId = inf->get_id();
-
- m_bStart = true;
}
return m_aId;
@@ -180,7 +178,6 @@ OUString const & URLParameter::get_program()
void URLParameter::init()
{
m_bHelpDataFileRead = false;
- m_bStart = false;
m_bUseDB = true;
m_nHitCount = 100; // The default maximum hitcount
}
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 07601e48eb1a..b261eaa99e96 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -175,7 +175,6 @@ namespace chelp {
Databases* m_pDatabases;
bool m_bHelpDataFileRead;
- bool m_bStart;
bool m_bUseDB;
OUString m_aURL;
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 1aa9c5ac3761..e42ee3b51d96 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1159,7 +1159,6 @@ class XMLScriptImportContext : public XMLTextFieldImportContext
OUString sScriptType;
bool bContentOK;
- bool bScriptTypeOK;
public:
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 437657b5442b..a4c05bcd37ae 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -45,9 +45,7 @@ class XMLValueImportHelper final
bool bStringType; /// is this a string (or a float) type?
bool bFormatOK; /// have we read a style:data-style-name attr.?
- bool bTypeOK; /// have we read a value-type attribute?
bool bStringValueOK; /// have we read a string-value attr.?
- bool bFloatValueOK; /// have we read any of the float attr.s?
bool bFormulaOK; /// have we read the formula attribute?
const bool bSetType; /// should PrepareField set the SetExp subtype?
@@ -118,7 +116,6 @@ private:
bool bDisplayFormula; /// display formula?(rather than value)
bool bDisplayNone; /// hide field?
- bool bNameOK; /// sName was set
bool bFormulaOK; /// sFormula was set
bool bDescriptionOK; /// sDescription was set
bool bHelpOK; /// sHelp was set
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index b573afd2fc9f..930ce52dd326 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -103,9 +103,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
uno::Reference< drawing::XShapes >& rShapes)
: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
maMinEdge(-2500.0, -2500.0, -2500.0),
- maMaxEdge(2500.0, 2500.0, 2500.0),
- mbMinEdgeUsed(false),
- mbMaxEdgeUsed(false)
+ maMaxEdge(2500.0, 2500.0, 2500.0)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -124,10 +122,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maMinEdge)
- {
maMinEdge = aNewVec;
- mbMinEdgeUsed = true;
- }
break;
}
case XML_TOK_3DCUBEOBJ_MAXEDGE:
@@ -136,10 +131,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maMaxEdge)
- {
maMaxEdge = aNewVec;
- mbMaxEdgeUsed = true;
- }
break;
}
}
@@ -193,9 +185,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
uno::Reference< drawing::XShapes >& rShapes)
: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
maCenter(0.0, 0.0, 0.0),
- maSphereSize(5000.0, 5000.0, 5000.0),
- mbCenterUsed(false),
- mbSizeUsed(false)
+ maSphereSize(5000.0, 5000.0, 5000.0)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -214,10 +204,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maCenter)
- {
maCenter = aNewVec;
- mbCenterUsed = true;
- }
break;
}
case XML_TOK_3DSPHEREOBJ_SIZE:
@@ -226,10 +213,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maSphereSize)
- {
maSphereSize = aNewVec;
- mbSizeUsed = true;
- }
break;
}
}
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index 819b4a3e26ee..3c68cd1b7bbc 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -57,8 +57,6 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext
{
::basegfx::B3DVector maMinEdge;
::basegfx::B3DVector maMaxEdge;
- bool mbMinEdgeUsed;
- bool mbMaxEdgeUsed;
public:
@@ -77,8 +75,6 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext
{
::basegfx::B3DVector maCenter;
::basegfx::B3DVector maSphereSize;
- bool mbCenterUsed;
- bool mbSizeUsed;
public:
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index b66b95d22cba..d5bce493255a 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -64,10 +64,6 @@ static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int3
struct XMLPropertyStateBuffer
{
XMLPropertyState* pPMMarginAll;
- XMLPropertyState* pPMMarginTop;
- XMLPropertyState* pPMMarginBottom;
- XMLPropertyState* pPMMarginLeft;
- XMLPropertyState* pPMMarginRight;
XMLPropertyState* pPMBorderAll;
XMLPropertyState* pPMBorderTop;
@@ -93,10 +89,6 @@ struct XMLPropertyStateBuffer
XMLPropertyStateBuffer::XMLPropertyStateBuffer()
: pPMMarginAll( nullptr )
- , pPMMarginTop( nullptr )
- , pPMMarginBottom( nullptr )
- , pPMMarginLeft( nullptr )
- , pPMMarginRight( nullptr )
,
pPMBorderAll( nullptr ),
pPMBorderTop( nullptr ),
@@ -352,10 +344,6 @@ void XMLPageMasterExportPropMapper::ContextFilter(
switch( nSimpleId )
{
case CTF_PM_MARGINALL: pBuffer->pPMMarginAll = pProp; break;
- case CTF_PM_MARGINTOP: pBuffer->pPMMarginTop = pProp; break;
- case CTF_PM_MARGINBOTTOM: pBuffer->pPMMarginBottom = pProp; break;
- case CTF_PM_MARGINLEFT: pBuffer->pPMMarginLeft = pProp; break;
- case CTF_PM_MARGINRIGHT: pBuffer->pPMMarginRight = pProp; break;
case CTF_PM_BORDERALL: pBuffer->pPMBorderAll = pProp; break;
case CTF_PM_BORDERTOP: pBuffer->pPMBorderTop = pProp; break;
case CTF_PM_BORDERBOTTOM: pBuffer->pPMBorderBottom = pProp; break;
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 46e5b7ed04f1..1ba9b665d3fd 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -60,7 +60,6 @@ namespace {
struct ColumnInfo
{
OUString msStyleName;
- bool mbVisibility;
OUString msDefaultCellStyleName;
};
@@ -404,10 +403,6 @@ SvXMLImportContext * XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, co
{
xInfo->msDefaultCellStyleName = sValue;
}
- else if( IsXMLToken( aLocalName, XML_VISIBILITY ) )
- {
- xInfo->mbVisibility = IsXMLToken( sValue, XML_VISIBLE );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list