editeng/source/editeng/eerdll.cxx | 5 +++--
external/libebook/ExternalProject_libebook.mk | 3 ++-
external/libmspub/ExternalProject_libmspub.mk | 3 ++-
external/liborcus/ExternalProject_liborcus.mk | 2 +-
external/libpagemaker/ExternalProject_libpagemaker.mk | 3 ++-
external/librevenge/ExternalProject_librevenge.mk | 3 ++-
include/svx/dialogs.hrc | 1 -
oox/source/docprop/ooxmldocpropimport.cxx | 7 ++++++-
sc/inc/externalrefmgr.hxx | 1 -
sc/source/ui/condformat/colorformat.cxx | 2 +-
sc/source/ui/docshell/externalrefmgr.cxx | 11 ++++++++---
sd/qa/unit/data/pptx/tdf93097.pptx |binary
sd/qa/unit/import-tests.cxx | 12 ++++++++++++
solenv/gbuild/platform/com_GCC_defs.mk | 2 ++
solenv/gbuild/platform/com_MSC_defs.mk | 3 +++
svx/source/stbctrls/stbctrls.src | 5 -----
svx/source/stbctrls/zoomsliderctrl.cxx | 3 ++-
17 files changed, 46 insertions(+), 20 deletions(-)
New commits:
commit e9451a50a7b7a232946680a77b98ce5c6dd50f8a
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Mon Aug 31 19:53:49 2015 +0200
core: fix build with system boost 1.59
9a6cdce37e601b1406c71fef16ad9b315045c9da was trying to fix the problem
with exposing deprecated vars and functions in system's error_code.hpp
include file by patching bundled boost version. This approach would
only make sense, when upstream version is going to be fixed ASAP. Apply
another approach, and follow the same pattern as applied in external
libraries, by defining
-DBOOST_ERROR_CODE_HEADER_ONLY \
-DBOOST_SYSTEM_NO_DEPRECATED
instead of patching bundled boost version. This way, the code would
work with unpatched system boost 1.59 final as well.
Reviewed-on: https://gerrit.libreoffice.org/18201
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Tested-by: David Ostrovsky <da...@ostrovsky.org>
(cherry picked from commit e00a3a684e22f45f36b4002ce726cb2975cb36ae)
Change-Id: I8684ca458ea4a5b7d7c3c3acfe7c14a6d19bc665
Reviewed-on: https://gerrit.libreoffice.org/18374
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/external/libebook/ExternalProject_libebook.mk
b/external/libebook/ExternalProject_libebook.mk
index 5e7f2b0..24244909 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -38,7 +38,8 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
$(if
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+ CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ -DBOOST_ERROR_CODE_HEADER_ONLY
-DBOOST_SYSTEM_NO_DEPRECATED" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
XML_LIBS="$(LIBXML_LIBS)" \
REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS='
' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
diff --git a/external/libmspub/ExternalProject_libmspub.mk
b/external/libmspub/ExternalProject_libmspub.mk
index 644fc42..6157320 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-werror \
--disable-weffc \
$(if
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+ CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ -DBOOST_ERROR_CODE_HEADER_ONLY
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
diff --git a/external/liborcus/ExternalProject_liborcus.mk
b/external/liborcus/ExternalProject_liborcus.mk
index 90d453c..ee890cd 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
endif
endif
-liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS)
$(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED
liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
ifeq ($(COM),MSC)
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk
b/external/libpagemaker/ExternalProject_libpagemaker.mk
index f892d42..7ec8d7a 100644
--- a/external/libpagemaker/ExternalProject_libpagemaker.mk
+++ b/external/libpagemaker/ExternalProject_libpagemaker.mk
@@ -33,7 +33,8 @@ $(call
gb_ExternalProject_get_state_target,libpagemaker,build) :
--disable-werror \
--disable-weffc \
$(if
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+ CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ -DBOOST_ERROR_CODE_HEADER_ONLY
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
diff --git a/external/librevenge/ExternalProject_librevenge.mk
b/external/librevenge/ExternalProject_librevenge.mk
index 861a47c..702a495 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -34,7 +34,8 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
--disable-generators \
--without-docs \
$(if
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+ CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ -DBOOST_ERROR_CODE_HEADER_ONLY
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
&& $(MAKE) \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 5b5a2bd..93b35a4 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -47,6 +47,8 @@ gb_CPPU_ENV := gcc3
gb_AFLAGS := $(AFLAGS)
gb_COMPILERDEFS := \
+ -DBOOST_ERROR_CODE_HEADER_ONLY \
+ -DBOOST_SYSTEM_NO_DEPRECATED \
-DCPPU_ENV=$(gb_CPPU_ENV) \
gb_CFLAGS_COMMON := \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index e02b581..aa82a93 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -44,6 +44,9 @@ endif
# like std::copy, std::transform (when MSVC_USE_DEBUG_RUNTIME is enabled)
gb_COMPILERDEFS := \
+ -DBOOST_ERROR_CODE_HEADER_ONLY \
+ -DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \
+ -DBOOST_SYSTEM_NO_DEPRECATED \
-D_CRT_NON_CONFORMING_SWPRINTFS \
-D_CRT_NONSTDC_NO_DEPRECATE \
-D_CRT_SECURE_NO_DEPRECATE \
commit ead98b51ee35d9f070ab426bf840bf234fd524c3
Author: Juergen Funk <juergen.funk...@cib.de>
Date: Tue Sep 1 11:23:28 2015 +0200
tdf#93052 - When save, generate unused list-styles in context.xml
Evaluation of the 0 is here
http://opengrok.libreoffice.org/xref/core/xmloff/source/text/txtparae.cxx#615
the methode "xNumRule->getCount()" get back the 0.
Change-Id: I15424fe7eb9d35a6a6d4f669e695efc904be320f
Reviewed-on: https://gerrit.libreoffice.org/18231
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/editeng/source/editeng/eerdll.cxx
b/editeng/source/editeng/eerdll.cxx
index 9250e23..d6caeb4 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -101,8 +101,9 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems = new SfxPoolItem*[EDITITEMCOUNT];
// Paragraph attributes:
- SvxNumRule aDefaultNumRule( SvxNumRuleFlags::BULLET_REL_SIZE |
SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE,
- SVX_MAX_NUM, false );
+ SvxNumRule aDefaultNumRule( SvxNumRuleFlags::NONE, 0, false );
+
+ // SvxNumRule aDefaultNumRule(SvxNumRuleFlags::NONE, SVX_MAX_NUM,
false);
ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP,
EE_PARA_WRITINGDIR );
ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
commit 4ae621663cda95d91b4439ce49c969c023e65a51
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Sep 4 11:49:25 2015 +0200
tdf#93097 oox: fix import of metadata from non-relative stream paths
Commit ef2668bad976f1fbb70759887cafd35ea7833655 (PPTX import: fix
missing document metadata, 2014-08-28) implemented metadata import for
the PPTX filter, but in case the metadata stream is not an existing one,
then OHierarchyHolder_Impl::GetListPathFromString() invoked by
OStorage::openStreamElementByHierarchicalName() throws.
The bugdoc is generated by a 3rd-party tool that always starts the
stream path with a slash, and MSO seems to just ignore that: so let's do
the same to be able to open the document.
Change-Id: I6c0715adeb19b9055669f6a45055415dd2c44e28
(cherry picked from commit 46cf9bb76b29f2bfa6639d9aaf4f26dee365bc0c)
Reviewed-on: https://gerrit.libreoffice.org/18368
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx
b/oox/source/docprop/ooxmldocpropimport.cxx
index c711f2f..646c09c 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -80,8 +80,13 @@ Sequence< InputSource > lclGetRelatedStreams( const
Reference< XStorage >& rxSto
const StringPair& rEntry = rEntries[ nEntryIndex ];
if ( rEntry.First == "Target" )
{
+ // The stream path is always a relative one, ignore the
leading "/" if it's there.
+ OUString aStreamPath = rEntry.Second;
+ if (aStreamPath.startsWith("/"))
+ aStreamPath = aStreamPath.copy(1);
+
Reference< XExtendedStorageStream > xExtStream(
- xHierarchy->openStreamElementByHierarchicalName(
rEntry.Second, ElementModes::READ ), UNO_QUERY_THROW );
+ xHierarchy->openStreamElementByHierarchicalName(
aStreamPath, ElementModes::READ ), UNO_QUERY_THROW );
Reference< XInputStream > xInStream =
xExtStream->getInputStream();
if( xInStream.is() )
{
diff --git a/sd/qa/unit/data/pptx/tdf93097.pptx
b/sd/qa/unit/data/pptx/tdf93097.pptx
new file mode 100644
index 0000000..687110d
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf93097.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 654b228..9589a43 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -105,6 +105,7 @@ public:
void testBnc910045();
void testRowHeight();
void testTdf93830();
+ void testTdf93097();
CPPUNIT_TEST_SUITE(SdImportTest);
@@ -145,6 +146,7 @@ public:
CPPUNIT_TEST(testBnc910045);
CPPUNIT_TEST(testRowHeight);
CPPUNIT_TEST(testTdf93830);
+ CPPUNIT_TEST(testTdf93097);
CPPUNIT_TEST_SUITE_END();
};
@@ -1225,6 +1227,16 @@ void SdImportTest::testTdf93830()
xDocShRef->DoClose();
}
+void SdImportTest::testTdf93097()
+{
+ // Throwing metadata import aborted the filter, check that metadata is now
imported.
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/tdf93097.pptx"), PPTX);
+ uno::Reference<document::XDocumentPropertiesSupplier>
xDocumentPropertiesSupplier(xDocShRef->GetModel(), uno::UNO_QUERY);
+ uno::Reference<document::XDocumentProperties> xDocumentProperties =
xDocumentPropertiesSupplier->getDocumentProperties();
+ CPPUNIT_ASSERT_EQUAL(OUString("ss"), xDocumentProperties->getTitle());
+ xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 8f501013d9940a02e2f966208328202e3b35574b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jun 11 08:46:23 2015 +0200
loplugin:staticmethods
Change-Id: If54b3017296f5bcea01b3b0d24d9ac821f6a24e9
(cherry picked from commit c82c94b40157c08bbbc524b2dc02714cbe82dc65)
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 1105136..edc6208 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -796,7 +796,6 @@ private:
*/
void transformUnsavedRefToSavedRef( SfxObjectShell* pShell );
- void insertRefCell(RefCellMap::iterator& itr, ScFormulaCell* pCell);
private:
ScDocument* mpDoc;
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 8bb9e7d..36a3882 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2043,7 +2043,10 @@ void ScExternalRefManager::refreshAllRefCells(sal_uInt16
nFileId)
pVShell->PaintGrid();
}
-void ScExternalRefManager::insertRefCell(RefCellMap::iterator& itr,
ScFormulaCell* pCell)
+namespace {
+
+void insertRefCellByIterator(
+ ScExternalRefManager::RefCellMap::iterator& itr, ScFormulaCell* pCell)
{
if (pCell)
{
@@ -2052,6 +2055,8 @@ void
ScExternalRefManager::insertRefCell(RefCellMap::iterator& itr, ScFormulaCel
}
}
+}
+
void ScExternalRefManager::insertRefCell(sal_uInt16 nFileId, const ScAddress&
rCell)
{
RefCellMap::iterator itr = maRefCells.find(nFileId);
@@ -2067,7 +2072,7 @@ void ScExternalRefManager::insertRefCell(sal_uInt16
nFileId, const ScAddress& rC
itr = r.first;
}
- insertRefCell(itr, mpDoc->GetFormulaCell(rCell));
+ insertRefCellByIterator(itr, mpDoc->GetFormulaCell(rCell));
}
void ScExternalRefManager::insertRefCellFromTemplate( ScFormulaCell*
pTemplateCell, ScFormulaCell* pCell )
@@ -2078,7 +2083,7 @@ void ScExternalRefManager::insertRefCellFromTemplate(
ScFormulaCell* pTemplateCe
for (RefCellMap::iterator itr = maRefCells.begin(); itr !=
maRefCells.end(); ++itr)
{
if (itr->second.find(pTemplateCell) != itr->second.end())
- insertRefCell(itr, pCell);
+ insertRefCellByIterator(itr, pCell);
}
}
commit 5ee3bf7e81e25d3a5cf6aa07bba9b7dbb7edd1a1
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Sep 4 14:02:20 2015 +0200
loplugin:passstuffbyref
Change-Id: I88baef02e5c8c87e7bc408212e16fd7039bfd7a1
(cherry picked from commit ec923b0c19f9d210c3ff9ad59d39ddcd4f958286)
diff --git a/sc/source/ui/condformat/colorformat.cxx
b/sc/source/ui/condformat/colorformat.cxx
index 3518e22..568c831 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -66,7 +66,7 @@ void SetValue( ScDocument* pDoc, ScColorScaleEntry* pEntry,
Edit& aEdit)
aEdit.Disable();
}
-void SelectColor(const Color& aColor, const OUString aCustomName,
ColorListBox& rLstBox)
+void SelectColor(const Color& aColor, const OUString & aCustomName,
ColorListBox& rLstBox)
{
rLstBox.SelectEntry( aColor );
if ( rLstBox.GetSelectEntryColor() != aColor )
commit 2eaa2e6df239eef2a2cd9eff916449c60e5c2142
Author: László Németh <laszlo.nem...@collabora.com>
Date: Fri Sep 4 18:26:34 2015 +0200
tdf#93928 don't hide the zoom slider and its handle with a tooltip
Change-Id: I8e5a3a02e80b845ef65dfed35cc3c324197ed88c
Reviewed-on: https://gerrit.libreoffice.org/18345
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index a57c68c..50d0d77 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1044,7 +1044,6 @@
#define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR (RID_SVX_START + 1289)
#define RID_SVXSTR_RECOVERYONLY_FINISH (RID_SVX_START + 1290)
#define RID_SVXSTR_ZOOMTOOL_HINT (RID_SVX_START + 1291)
-#define RID_SVXSTR_ZOOM (RID_SVX_START + 1292)
#define RID_SVXSTR_ZOOM_IN (RID_SVX_START + 1293)
#define RID_SVXSTR_ZOOM_OUT (RID_SVX_START + 1294)
#define RID_SVXSTR_CUSTOM (RID_SVX_START + 1295)
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index a31e6d4..0337f77 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -126,11 +126,6 @@ String RID_SVXSTR_ZOOMTOOL_HINT
Text [ en-US ] = "Zoom level. Right-click to change zoom level or click to
open Zoom dialog.";
};
-String RID_SVXSTR_ZOOM
-{
- Text [ en-US ] = "Adjust zoom level";
-};
-
String RID_SVXSTR_ZOOM_IN
{
Text [ en-US ] = "Zoom In";
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx
b/svx/source/stbctrls/zoomsliderctrl.cxx
index 526bed7..933c453 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -390,7 +390,8 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent &
rEvt )
nXDiff <= aControlRect.GetWidth() - nSliderXOffset +
nButtonRightOffset )
GetStatusBar().SetQuickHelpText(GetId(),
SVX_RESSTR(RID_SVXSTR_ZOOM_IN));
else
- GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM));
+ // don't hide the slider and its handle with a tooltip during zooming
+ GetStatusBar().SetQuickHelpText(GetId(), "");
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
