[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - oox/source

[Miklos Vajna]

 oox/source/token/namespaces.hxx.tail |    1 +
 oox/source/token/namespaces.txt      |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 0f61ec4974a8c9aee85c3225814c002371eac4ff
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Jun 19 17:13:29 2013 +0200

    fdo#43641 oox: add support for the lockedCanvas namespace
    
    The plan is that once these are here, the writerfilter ooxml tokenizer
    can refer to them. And then the writerfilter will call back to oox to do
    the real drawingml import.
    
    Change-Id: Ibc0d9838f3db717004a3bc8b80a408a39c8f0886
    (cherry picked from commit 32b93c5c4f0663eefd1e1979875f8af659c463df)
    Reviewed-on: https://gerrit.libreoffice.org/4420
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail
index 7b1e869..b684ea5 100644
--- a/oox/source/token/namespaces.hxx.tail
+++ b/oox/source/token/namespaces.hxx.tail
@@ -51,6 +51,7 @@ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; }
 #define XML_TOKEN( token )      OOX_TOKEN( xml, token )
 #define VMLPPT_TOKEN( token )   OOX_TOKEN( vmlPowerpoint, token )
 #define DSP_TOKEN( token )      OOX_TOKEN( dsp, token )
+#define LC_TOKEN( token )       OOX_TOKEN( dmlLockedCanvas, token )
 
 // ============================================================================
 
diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt
index 98f8dcf..78ba6ba 100644
--- a/oox/source/token/namespaces.txt
+++ b/oox/source/token/namespaces.txt
@@ -49,6 +49,7 @@ dsp                     http://schemas.microsoft.com/office/drawing/2008/diagram
 dmlChart                http://schemas.openxmlformats.org/drawingml/2006/chart
 dmlChartDr              http://schemas.openxmlformats.org/drawingml/2006/chartDrawing
 dmlDiagram              http://schemas.openxmlformats.org/drawingml/2006/diagram
+dmlLockedCanvas         http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas
 dmlPicture              http://schemas.openxmlformats.org/drawingml/2006/picture
 dmlSpreadDr             http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing
 dmlWordDr               http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing