[Libreoffice-commits] .: 2 commits - oox/inc oox/source postprocess/packcomponents scp2/source unusedcode.easy

[Jan Holesovsky]

 oox/inc/oox/drawingml/customshapeproperties.hxx |    1 -
 oox/source/drawingml/customshapeproperties.cxx  |    5 -----
 postprocess/packcomponents/makefile.mk          |    4 +---
 scp2/source/ooo/file_library_ooo.scp            |    2 +-
 unusedcode.easy                                 |    1 -
 5 files changed, 2 insertions(+), 11 deletions(-)

New commits:
commit fcea2c9acb30fba319bad49d0f5e60b78f1ecacf
Author: Felix Zhang <felix at linux-6chh.site>
Date:   Wed Oct 19 17:59:13 2011 +0800

    remove an unused method

diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx
index 6b3838b..1b72daa 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/oox/inc/oox/drawingml/customshapeproperties.hxx
@@ -119,7 +119,6 @@ public:
     CustomShapeProperties();
     virtual ~CustomShapeProperties();
 
-    void apply( const CustomShapePropertiesPtr& );
     void pushToPropSet( const ::oox::core::FilterBase& rFilterBase,
             const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
                         const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape) const;
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 585ec43..2c90444 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -94,11 +94,6 @@ sal_Int32 CustomShapeProperties::GetCustomShapeGuideValue( const std::vector< Cu
     return nIndex;
 }
 
-void CustomShapeProperties::apply( const CustomShapePropertiesPtr& /* rSourceCustomShapeProperties */ )
-{
-    // not sure if this needs to be implemented
-}
-
 CustomShapeProperties::PresetsMap CustomShapeProperties::maPresetsMap;
 
 void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFilterBase */,
diff --git a/unusedcode.easy b/unusedcode.easy
index b6f16e0..88a758a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2460,7 +2460,6 @@ oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
 oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
 oox::drawingml::ColorPropertySet::getColor()
 oox::drawingml::ColorPropertySet::setColor(int)
-oox::drawingml::CustomShapeProperties::apply(boost::shared_ptr<oox::drawingml::CustomShapeProperties> const&)
 oox::drawingml::CustomShapeProperties::getValue(std::__debug::vector<oox::drawingml::CustomShapeGuide, std::allocator<oox::drawingml::CustomShapeGuide> > const&, unsigned int) const
 oox::drawingml::Diagram::getLayoutId() const
 oox::drawingml::DiagramLayout::layout(std::__debug::vector<oox::drawingml::dgm::Point, std::allocator<oox::drawingml::dgm::Point> > const&, com::sun::star::awt::Point const&)
commit f4496d4478c3e754d13242d9d55bddee7bd9985e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 19 11:27:34 2011 +0200

    Fix the SYSTEM_MOZILLA case.

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index e41ead3..bbea2d1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -276,18 +276,16 @@ my_components += \
 my_components += ldapbe2
 .END
 
-.IF "$(ENABLE_NSS_MODULE)" != "NO"
+.IF "$(ENABLE_NSS_MODULE)" == "YES" || "$(SYSTEM_MOZILLA)" == "YES"
 my_components += \
     component/xmlsecurity/util/xsec_fw \
     pl
-.IF "$(SYSTEM_MOZILLA)" == "YES" || "$(ENABLE_NSS_MODULE)" == "YES"
 .IF "$(OS)" == "WNT"
 my_components += component/xmlsecurity/util/xsec_xmlsec.windows
 .ELSE
 my_components += component/xmlsecurity/util/xsec_xmlsec
 .END
 .END
-.END
 
 .IF "$(OS)" == "MACOSX"
 my_components += \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index d98f745..5d60eb5 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1432,7 +1432,7 @@ File gid_File_Lib_XSec_XMLSecurity
     Styles = (PACKED);
 End
 
-#ifdef ENABLE_NSS_MODULE
+#if defined(ENABLE_NSS_MODULE) || defined(SYSTEM_MOZILLA)
 File gid_File_Lib_XSec_Framework
     TXT_FILE_BODY;
 	#ifdef UNX