[Libreoffice-commits] .: 3 commits - compilerplugins/clang compilerplugins/README writerfilter/source

[Libreoffice Gerrit user]

 compilerplugins/README              |    2 +-
 compilerplugins/clang/plugin.cxx    |    5 ++---
 writerfilter/source/ooxml/model.xml |    5 -----
 3 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 03910bdfd964ee34bdd93fda3339908cad2b01f4
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Jan 11 14:55:17 2013 +0100

    point to our wiki page on clang rather than clang homepage
    
    Change-Id: Ia54040c7ed02e6a2d62dd93890a7d1467dd83a40

diff --git a/compilerplugins/README b/compilerplugins/README
index 1261a34..9dae9a1 100644
--- a/compilerplugins/README
+++ b/compilerplugins/README
@@ -7,7 +7,7 @@ This directory contains code for compiler plugins. These are used to perform
 additional actions during compilation (such as additional warnings) and
 also to perform mass code refactoring.
 
-Currently only the Clang compiler is supported (http://clang.llvm.org).
+Currently only the Clang compiler is supported (http://wiki.documentfoundation.org/Development/Clang).
 
 
 == Usage ==
commit a18aa3016b6e97d3702c99a7dff37022e9ae2580
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Jan 7 17:49:58 2013 +0100

    remove block that is a complete nonsense
    
    result of incorrect merges
    
    Change-Id: I43f5ef2afbd5390f937f1220613ffa7d1f284634

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index d961f87..73acba6 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22798,11 +22798,6 @@
       <attribute name="element" tokenid="ooxml:CT_SmartTagRun_element"/>
     </resource>
     <resource name="EG_PContent" resource="Properties" tag="content">
-      <element name="sdtPr" tokenid="ooxml:CT_SdtPr"/>
-      <element name="sdtEndPr" tokenid="ooxml:CT_SdtEndPr"/>
-      <element name="sdtContent" tokenid="ooxml:CT_SdtContentRun"/>
-    </resource>
-    <resource name="EG_PContent" resource="Properties" tag="content">
       <element name="fldSimple" tokenid="ooxml:EG_PContent_fldSimple"/>
       <element name="hyperlink" tokenid="ooxml:EG_PContent_hyperlink"/>
       <element name="subDoc" tokenid="ooxml:EG_PContent_subDoc"/>
commit d9a5c6bdf0106c9cf7eb6a94c8ed0b68867b29e9
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Jan 7 12:24:58 2013 +0100

    fix detection whether to ignore a source file or not
    
    When compiling using icecream, the whole input is one file fed from stdin,
    so getBufferName() is "<stdin>", so get the filename from #line directives.
    
    Change-Id: Ie87937b10b0c7e8ddfa57a405b80fd9bde68dd0a

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 7c4256b..db9521f 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -55,9 +55,8 @@ bool Plugin::ignoreLocation( SourceLocation loc )
     SourceLocation expansionLoc = context.getSourceManager().getExpansionLoc( loc );
     if( context.getSourceManager().isInSystemHeader( expansionLoc ))
         return true;
-    bool invalid;
-    const char* bufferName = context.getSourceManager().getBufferName( expansionLoc, &invalid );
-    if( invalid )
+    const char* bufferName = context.getSourceManager().getPresumedLoc( expansionLoc ).getFilename();
+    if( bufferName == NULL )
         return true;
     if( strncmp( bufferName, OUTDIR, strlen( OUTDIR )) == 0
         || strncmp( bufferName, WORKDIR, strlen( WORKDIR )) == 0