[Libreoffice-commits] .: 3 commits - oox/inc oox/source sc/source writerfilter/source

Caolán McNamara caolan at kemper.freedesktop.org
Fri Apr 27 05:47:49 PDT 2012


 oox/inc/oox/helper/propertyset.hxx                       |    1 -
 oox/inc/oox/vml/vmldrawing.hxx                           |    4 ++--
 oox/inc/oox/vml/vmlshape.hxx                             |    2 +-
 oox/source/core/xmlfilterbase.cxx                        |    1 +
 oox/source/drawingml/chart/datasourceconverter.cxx       |    1 +
 oox/source/helper/graphichelper.cxx                      |    1 +
 oox/source/ole/vbaproject.cxx                            |    1 +
 sc/source/filter/oox/autofilterbuffer.cxx                |    1 +
 sc/source/filter/oox/condformatbuffer.cxx                |    1 +
 sc/source/filter/oox/drawingbase.cxx                     |    1 +
 sc/source/filter/oox/excelvbaproject.cxx                 |    1 +
 sc/source/filter/oox/externallinkbuffer.cxx              |    1 +
 sc/source/filter/oox/formulabase.cxx                     |    1 +
 sc/source/filter/oox/formulaparser.cxx                   |    1 +
 sc/source/filter/oox/pivotcachebuffer.cxx                |    1 +
 sc/source/filter/oox/pivottablebuffer.cxx                |    1 +
 sc/source/filter/oox/querytablebuffer.cxx                |    1 +
 sc/source/filter/oox/scenariobuffer.cxx                  |    1 +
 sc/source/filter/oox/tablebuffer.cxx                     |    1 +
 sc/source/filter/oox/unitconverter.cxx                   |    1 +
 sc/source/filter/oox/workbooksettings.cxx                |    1 +
 sc/source/filter/oox/worksheetbuffer.cxx                 |    1 +
 sc/source/filter/oox/worksheetsettings.cxx               |    1 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |    2 ++
 writerfilter/source/dmapper/PropertyMap.cxx              |    5 ++---
 25 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit cff388eb4b1f7d33c913e191bf91f48bc3734ba2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 27 13:39:54 2012 +0100

    WaE: msvc2008 unused variables
    
    Change-Id: If956faf42dcc5625c490e685d6ca69bb07e00188

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 9ce50c9..275edd6 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -720,6 +720,8 @@ void DomainMapperTableHandler::endTable()
             fprintf( stderr, "Conversion to table error: %s\n",
                     rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
             dmapper_logger->chars(std::string("failed to import table!"));
+#else
+            (void)e;
 #endif
         }
         catch ( const uno::Exception &e )
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 42cac7d..36ddd32 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -977,7 +977,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
                 xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_DESC_NAME ),
                     uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName ));
                 // handle page breaks with odd/even page numbering
-                style::PageStyleLayout nPageStyleLayout;
+                style::PageStyleLayout nPageStyleLayout(style::PageStyleLayout_ALL);
                 if (m_nBreakType == 3)
                     nPageStyleLayout = style::PageStyleLayout_LEFT;
                 else if (m_nBreakType == 4)
@@ -992,10 +992,9 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
                 }
             }
         }
-        catch( const uno::Exception& rEx)
+        catch (const uno::Exception&)
         {
             OSL_FAIL( "Exception in SectionPropertyMap::CloseSectionGroup");
-            (void)rEx;
         }
     }
 }
commit 110d272675e0d1444e702ba268786a0344e4b069
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 27 13:39:20 2012 +0100

    include oox/token/properties.hxx directly where needed
    
    Change-Id: I04e23f69717aadc157169ade40a2407ecdd92a7e

diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx
index 9f47f34..5e9b312 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include "oox/token/properties.hxx"
 #include "oox/dllapi.h"
 
 namespace oox {
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index f1aebdd..24a1391 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -48,6 +48,7 @@
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/helper/zipstorage.hxx"
+#include "oox/token/properties.hxx"
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx
index 4f5da6e..f563aeb 100644
--- a/oox/source/drawingml/chart/datasourceconverter.cxx
+++ b/oox/source/drawingml/chart/datasourceconverter.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include "oox/drawingml/chart/chartconverter.hxx"
 #include "oox/drawingml/chart/datasourcemodel.hxx"
+#include "oox/token/properties.hxx"
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 66f6313..53ddb54 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -42,6 +42,7 @@
 #include <svtools/wmf.hxx>
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "oox/token/tokens.hxx"
 
 namespace oox {
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 0dfb1dc..ff0b0f2 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -51,6 +51,7 @@
 #include "oox/ole/vbahelper.hxx"
 #include "oox/ole/vbainputstream.hxx"
 #include "oox/ole/vbamodule.hxx"
+#include "oox/token/properties.hxx"
 
 namespace oox {
 namespace ole {
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 8543840..83a47e4 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -38,6 +38,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "addressconverter.hxx"
 #include "biffinputstream.hxx"
 #include "defnamesbuffer.hxx"
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index e7ec181..d4ea980 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -46,6 +46,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "addressconverter.hxx"
 #include "biffinputstream.hxx"
 #include "stylesbuffer.hxx"
diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index 3e3cb64..4a30a15 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -33,6 +33,7 @@
 #include "oox/helper/binaryinputstream.hxx"
 #include "unitconverter.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx
index 148f27a..ceb73ec 100644
--- a/sc/source/filter/oox/excelvbaproject.cxx
+++ b/sc/source/filter/oox/excelvbaproject.cxx
@@ -39,6 +39,7 @@
 #include <rtl/ustrbuf.hxx>
 #include "oox/helper/helper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index d9cd78c..d6b7587 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -42,6 +42,7 @@
 #include <rtl/strbuf.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
+#include "oox/token/properties.hxx"
 #include "addressconverter.hxx"
 #include "biffinputstream.hxx"
 #include "excelhandlers.hxx"
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 934ff8c..efc9930 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -44,6 +44,7 @@
 #include <rtl/ustrbuf.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/containerhelper.hxx"
+#include "oox/token/properties.hxx"
 #include "biffinputstream.hxx"
 
 namespace oox {
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index aa4c0f7..a4e5f71 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/sheet/ReferenceFlags.hpp>
 #include <com/sun/star/sheet/SingleReference.hpp>
 #include "oox/core/filterbase.hxx"
+#include "oox/token/properties.hxx"
 #include "addressconverter.hxx"
 #include "biffinputstream.hxx"
 #include "defnamesbuffer.hxx"
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 0e6adcf..650c2a1 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -40,6 +40,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "biffinputstream.hxx"
 #include "defnamesbuffer.hxx"
 #include "excelhandlers.hxx"
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index 8496510..55fc315 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -50,6 +50,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "addressconverter.hxx"
 #include "biffinputstream.hxx"
 
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index 2a34d65..697ccc8 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/sheet/XAreaLinks.hpp>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
+#include "oox/token/properties.hxx"
 #include "addressconverter.hxx"
 #include "biffinputstream.hxx"
 #include "connectionsbuffer.hxx"
diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index fbfb722..4f3ed51 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -37,6 +37,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "addressconverter.hxx"
 #include "biffinputstream.hxx"
 
diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx
index a2c9822..78c9c7d 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -32,6 +32,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "addressconverter.hxx"
 
 namespace oox {
diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index 8611204..e2feb87 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -37,6 +37,7 @@
 #include <rtl/math.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "stylesbuffer.hxx"
 
 namespace oox {
diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx
index eec444f..b98cb7d 100644
--- a/sc/source/filter/oox/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -36,6 +36,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/core/xmlfilterbase.hxx"
+#include "oox/token/properties.hxx"
 #include "biffinputstream.hxx"
 #include "unitconverter.hxx"
 
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index 6397c5d..8e092ac 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -39,6 +39,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/token/properties.hxx"
 #include "biffinputstream.hxx"
 #include "excelhandlers.hxx"
 
diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx
index 3010aec..02c2652 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/util/XProtectable.hpp>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
+#include "oox/token/properties.hxx"
 #include "biffinputstream.hxx"
 #include "pagesettings.hxx"
 #include "workbooksettings.hxx"
commit 231e9cff20346f5c28f8858c970ca9cb8506662f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 27 12:47:54 2012 +0100

    WaE: scary msvc2008 warning about using delete on an incomplete type
    
    Change-Id: I2d83fde2e52576f73cbc0d99053734e5068c1f9c

diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index 5415dee..9a10b17 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -32,7 +32,9 @@
 #include <map>
 #include <memory>
 #include <vector>
+#include <oox/ole/axcontrol.hxx>
 #include <oox/ole/oleobjecthelper.hxx>
+#include <oox/vml/vmlshapecontainer.hxx>
 #include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
@@ -46,14 +48,12 @@ namespace com { namespace sun { namespace star {
 namespace oox {
     namespace core { class XmlFilterBase; }
     namespace ole { class EmbeddedControl; }
-    namespace ole { class EmbeddedForm; }
 }
 
 namespace oox {
 namespace vml {
 
 class ShapeBase;
-class ShapeContainer;
 struct ClientData;
 
 // ============================================================================
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index d969577..b60e251 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -33,6 +33,7 @@
 #include <vector>
 #include <com/sun/star/awt/Point.hpp>
 #include "oox/vml/vmlformatting.hxx"
+#include "oox/vml/vmltextbox.hxx"
 #include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
@@ -47,7 +48,6 @@ namespace vml {
 class Drawing;
 struct ShapeParentAnchor;
 class ShapeContainer;
-class TextBox;
 
 // ============================================================================
 


More information about the Libreoffice-commits mailing list