[Libreoffice-commits] core.git: 3 commits - ios/experimental oox/inc oox/Library_oox.mk oox/source
Tor Lillqvist
tml at collabora.com
Mon Feb 27 17:48:42 UTC 2017
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 4
oox/Library_oox.mk | 2
oox/inc/drawingml/fillpropertiesgroupcontext.hxx | 248 ------
oox/inc/drawingml/misccontexts.hxx | 248 ++++++
oox/inc/drawingml/textparagraphproperties.hxx | 2
oox/inc/pch/precompiled_oox.hxx | 2
oox/source/drawingml/customshapeproperties.cxx | 2
oox/source/drawingml/diagram/datamodelcontext.cxx | 2
oox/source/drawingml/effectpropertiescontext.cxx | 2
oox/source/drawingml/fillpropertiesgroupcontext.cxx | 384 ----------
oox/source/drawingml/graphicshapecontext.cxx | 12
oox/source/drawingml/linepropertiescontext.cxx | 2
oox/source/drawingml/misccontexts.cxx | 384 ++++++++++
oox/source/drawingml/shape.cxx | 25
oox/source/drawingml/shapecontext.cxx | 2
oox/source/drawingml/shapepropertiescontext.cxx | 3
oox/source/drawingml/table/tablebackgroundstylecontext.cxx | 2
oox/source/drawingml/table/tablecellcontext.cxx | 2
oox/source/drawingml/table/tablestylecellstylecontext.cxx | 2
oox/source/drawingml/themeelementscontext.cxx | 2
oox/source/ppt/backgroundproperties.cxx | 3
oox/source/ppt/pptgraphicshapecontext.cxx | 2
oox/source/ppt/pptshapecontext.cxx | 2
oox/source/ppt/pptshapepropertiescontext.cxx | 2
24 files changed, 670 insertions(+), 671 deletions(-)
New commits:
commit 58da79fd02d6f2b49ccd03d9b5a984a231e1cd52
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 27 18:54:50 2017 +0200
Rename misleadingly named include file fillpropertiesgroupcontext.hxx
There is nothing called FillPropertiesGroupContext. Rename the file to
"misccontexts.hxx" as I could not come up with some more specific name
that would describe the collection of classes defined in it. Rename
the corresponding cxx file, too.
Change-Id: I44db1db8c63c8e897774597b46a237a214aacedf
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 392f6c6..cffc1e3 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -312,7 +312,7 @@
BE55B11C18DB67A900950228 /* effectpropertiescontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effectpropertiescontext.cxx; path = ../../../oox/source/drawingml/effectpropertiescontext.cxx; sourceTree = SOURCE_ROOT; };
BE55B11D18DB67A900950228 /* embeddedwavaudiofile.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = embeddedwavaudiofile.cxx; path = ../../../oox/source/drawingml/embeddedwavaudiofile.cxx; sourceTree = SOURCE_ROOT; };
BE55B11E18DB67A900950228 /* fillproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fillproperties.cxx; path = ../../../oox/source/drawingml/fillproperties.cxx; sourceTree = SOURCE_ROOT; };
- BE55B11F18DB67A900950228 /* fillpropertiesgroupcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fillpropertiesgroupcontext.cxx; path = ../../../oox/source/drawingml/fillpropertiesgroupcontext.cxx; sourceTree = SOURCE_ROOT; };
+ BE55B11F18DB67A900950228 /* misccontexts.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = misccontexts.cxx; path = ../../../oox/source/drawingml/misccontexts.cxx; sourceTree = SOURCE_ROOT; };
BE55B12018DB67A900950228 /* graphicshapecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicshapecontext.cxx; path = ../../../oox/source/drawingml/graphicshapecontext.cxx; sourceTree = SOURCE_ROOT; };
BE55B12118DB67A900950228 /* guidcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = guidcontext.cxx; path = ../../../oox/source/drawingml/guidcontext.cxx; sourceTree = SOURCE_ROOT; };
BE55B12218DB67A900950228 /* hyperlinkcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlinkcontext.cxx; path = ../../../oox/source/drawingml/hyperlinkcontext.cxx; sourceTree = SOURCE_ROOT; };
@@ -1316,7 +1316,7 @@
BE55B11C18DB67A900950228 /* effectpropertiescontext.cxx */,
BE55B11D18DB67A900950228 /* embeddedwavaudiofile.cxx */,
BE55B11E18DB67A900950228 /* fillproperties.cxx */,
- BE55B11F18DB67A900950228 /* fillpropertiesgroupcontext.cxx */,
+ BE55B11F18DB67A900950228 /* misccontexts.cxx */,
BE55B12018DB67A900950228 /* graphicshapecontext.cxx */,
BE55B12118DB67A900950228 /* guidcontext.cxx */,
BE55B12218DB67A900950228 /* hyperlinkcontext.cxx */,
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index e6765f4..3d6c684 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -151,7 +151,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/drawingml/effectpropertiescontext \
oox/source/drawingml/embeddedwavaudiofile \
oox/source/drawingml/fillproperties \
- oox/source/drawingml/fillpropertiesgroupcontext \
+ oox/source/drawingml/misccontexts \
oox/source/drawingml/graphicshapecontext \
oox/source/drawingml/guidcontext \
oox/source/drawingml/hyperlinkcontext \
diff --git a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx b/oox/inc/drawingml/misccontexts.hxx
similarity index 98%
rename from oox/inc/drawingml/fillpropertiesgroupcontext.hxx
rename to oox/inc/drawingml/misccontexts.hxx
index 4c40ff3..67d2d0e 100644
--- a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx
+++ b/oox/inc/drawingml/misccontexts.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
-#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_MISCCONTEXTS_HXX
+#define INCLUDED_OOX_DRAWINGML_MISCCONTEXTS_HXX
#include <drawingml/colorchoicecontext.hxx>
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index fb9f3cc..4b869f5 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <drawingml/fillpropertiesgroupcontext.hxx>
+#include <drawingml/misccontexts.hxx>
#include <drawingml/textcharacterproperties.hxx>
#include <com/sun/star/style/NumberingType.hpp>
#include <drawingml/textfont.hxx>
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 1bfc947..5949c9f 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -163,7 +163,7 @@
#include <drawingml/customshapegeometry.hxx>
#include <drawingml/customshapeproperties.hxx>
#include <drawingml/fillproperties.hxx>
-#include <drawingml/fillpropertiesgroupcontext.hxx>
+#include <drawingml/misccontexts.hxx>
#include <drawingml/lineproperties.hxx>
#include <drawingml/shapepropertiescontext.hxx>
#include <drawingml/shapestylecontext.hxx>
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx
index 55627c4..a48e2c2 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -19,7 +19,7 @@
#include "datamodelcontext.hxx"
#include "oox/helper/attributelist.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/shapepropertiescontext.hxx"
#include "drawingml/textbodycontext.hxx"
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index 63faada..fd4eadc 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -10,7 +10,7 @@
#include "effectpropertiescontext.hxx"
#include "effectproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "oox/helper/attributelist.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 7bfcbe9..fa59e0a 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -23,7 +23,7 @@
#include <osl/diagnose.h>
#include <drawingml/embeddedwavaudiofile.hxx>
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/graphicproperties.hxx"
#include "drawingml/customshapeproperties.hxx"
#include "drawingml/diagram/diagram.hxx"
diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx
index b77d66f..2d3bfd6 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -19,7 +19,7 @@
#include "drawingml/linepropertiescontext.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/lineproperties.hxx"
#include "oox/helper/attributelist.hxx"
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/misccontexts.cxx
similarity index 99%
rename from oox/source/drawingml/fillpropertiesgroupcontext.cxx
rename to oox/source/drawingml/misccontexts.cxx
index 805184e..06c2013 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/graphichelper.hxx"
#include "oox/core/xmlfilterbase.hxx"
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index 686de17..75db485 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -27,7 +27,7 @@
#include "oox/drawingml/shapecontext.hxx"
#include <drawingml/shapepropertiescontext.hxx>
#include "drawingml/shapestylecontext.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/lineproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "drawingml/customshapegeometry.hxx"
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index d3c4ed9..82f5207 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -27,7 +27,7 @@
#include "drawingml/scene3dcontext.hxx"
#include "drawingml/linepropertiescontext.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/transform2dcontext.hxx"
#include "drawingml/customshapegeometry.hxx"
#include "effectpropertiescontext.hxx"
diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
index b376cab..4a9cf3a 100644
--- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
+++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
@@ -20,7 +20,7 @@
#include <osl/diagnose.h>
#include "drawingml/table/tablebackgroundstylecontext.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "oox/helper/attributelist.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx
index e7bffe3..0d738d4 100644
--- a/oox/source/drawingml/table/tablecellcontext.cxx
+++ b/oox/source/drawingml/table/tablecellcontext.cxx
@@ -22,7 +22,7 @@
#include "drawingml/table/tablecellcontext.hxx"
#include "drawingml/textbodycontext.hxx"
#include "drawingml/linepropertiescontext.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "oox/helper/attributelist.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx
index cc4d381..e2dc4b5 100644
--- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx
@@ -20,7 +20,7 @@
#include <osl/diagnose.h>
#include "drawingml/table/tablestylecellstylecontext.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/linepropertiescontext.hxx"
#include "oox/helper/attributelist.hxx"
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx
index 2ed435d..a936c36 100644
--- a/oox/source/drawingml/themeelementscontext.cxx
+++ b/oox/source/drawingml/themeelementscontext.cxx
@@ -22,7 +22,7 @@
#include "drawingml/lineproperties.hxx"
#include "drawingml/linepropertiescontext.hxx"
#include "drawingml/fillproperties.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/textcharacterproperties.hxx"
#include "oox/drawingml/theme.hxx"
#include "oox/helper/attributelist.hxx"
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index c773709..29ffe62 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -18,7 +18,7 @@
*/
#include "oox/ppt/backgroundproperties.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "oox/core/contexthandler2.hxx"
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 29011d5..152872f 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -28,7 +28,7 @@
#include "oox/ppt/pptshapepropertiescontext.hxx"
#include "oox/ppt/slidepersist.hxx"
#include "drawingml/shapestylecontext.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/lineproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "drawingml/customshapegeometry.hxx"
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 16c0eb2..81e0cbb 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -29,7 +29,7 @@
#include "oox/ppt/pptshapepropertiescontext.hxx"
#include "oox/ppt/slidepersist.hxx"
#include "drawingml/shapestylecontext.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/lineproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "drawingml/customshapegeometry.hxx"
diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx
index c5ff7af..4fca73a 100644
--- a/oox/source/ppt/pptshapepropertiescontext.cxx
+++ b/oox/source/ppt/pptshapepropertiescontext.cxx
@@ -27,7 +27,7 @@
#include "oox/ppt/pptshapepropertiescontext.hxx"
#include "oox/ppt/slidepersist.hxx"
#include "drawingml/shapestylecontext.hxx"
-#include "drawingml/fillpropertiesgroupcontext.hxx"
+#include "drawingml/misccontexts.hxx"
#include "drawingml/lineproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "drawingml/customshapegeometry.hxx"
commit b937abd24f3e89c0d5392c7839e418ff9404ebcb
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 27 18:47:01 2017 +0200
There is nothing called FillPropertiesGroupContext since 2009
So bin two pointless and misleading comments that consist of just that
identifier.
Change-Id: I14724b21d43283dbda1856ab28c56ae44512c3cc
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index 930c594..d3c4ed9 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -104,7 +104,6 @@ ContextHandlerRef ShapePropertiesContext::onCreateContext( sal_Int32 aElementTok
break;
}
- // FillPropertiesGroupContext
return FillPropertiesContext::createFillContext( *this, aElementToken, rAttribs, mrShape.getFillProperties() );
}
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index ffafb35..c773709 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -44,7 +44,6 @@ BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2& rPar
return this;
}
- // FillPropertiesGroupContext
return dynamic_cast <ContextHandler *> (::oox::drawingml::FillPropertiesContext::createFillContext( *this, aElementToken, rAttribs, mrFillProperties ).get());
}
commit 575db750f18f2e6d645e03f45534c2e03dddcb76
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 27 16:55:15 2017 +0200
Clean up a few SAL_INFOs a bit and add useful note about the ==cscode== etc
I dislike OSL_THIS_FUNC, it is too verbose, at least with Clang on
Linux. Just use the Class::Name without parameters and namespaces.
Change-Id: Ic8722a131463762ab70ff35d64ae7040c67bf595
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 5fddf19..b791e2b 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -390,6 +390,8 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
aPropertyMap.setProperty( PROP_Handles, aHandles);
#ifdef DEBUG
+ // Note that the script oox/source/drawingml/customshapes/generatePresetsData.pl looks
+ // for these ==cscode== and ==csdata== markers, so don't "clean up" these SAL_INFOs.
SAL_INFO("oox.cscode", "==cscode== begin");
aPropertyMap.dumpCode( aPropertyMap.makePropertySet() );
SAL_INFO("oox.cscode", "==cscode== end");
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index ab0d474..7bfcbe9 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -263,14 +263,12 @@ ContextHandlerRef DiagramGraphicDataContext::onCreateContext( ::sal_Int32 aEleme
getFragmentPathFromRelId( msLo ),
getFragmentPathFromRelId( msQs ),
getFragmentPathFromRelId( msCs ));
- SAL_INFO("oox.drawingml", OSL_THIS_FUNC
- << "diagram added shape " << mpShapePtr->getName()
+ SAL_INFO("oox.drawingml", "DiagramGraphicDataContext::onCreateContext: added shape " << mpShapePtr->getName()
<< " of type " << mpShapePtr->getServiceName()
- << ", size (" << mpShapePtr->getPosition().X
+ << ", position: " << mpShapePtr->getPosition().X
<< "," << mpShapePtr->getPosition().Y
- << "," << mpShapePtr->getSize().Width
- << "," << mpShapePtr->getSize().Height
- <<")");
+ << ", size: " << mpShapePtr->getSize().Width
+ << "x" << mpShapePtr->getSize().Height);
// No DrawingML fallback, need to warn the user at the end.
if (mpShapePtr->getExtDrawings().empty())
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 54ebdfc..01d79c0 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -246,7 +246,7 @@ void Shape::addShape(
const awt::Rectangle* pShapeRect,
ShapeIdMap* pShapeMap )
{
- SAL_INFO("oox.drawingml", OSL_THIS_FUNC << " id: " << msId);
+ SAL_INFO("oox.drawingml", "Shape::getShapeStyleRef: id='" << msId << "'");
try
{
@@ -275,7 +275,7 @@ void Shape::addShape(
}
catch( const Exception& e )
{
- SAL_WARN( "oox.drawingml", OSL_THIS_FUNC << "Exception: " << e.Message );
+ SAL_WARN( "oox.drawingml", "Shape::addShape: Exception: " << e.Message );
}
}
@@ -296,7 +296,7 @@ void Shape::setTextBox(bool bTextBox)
void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText )
{
- SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
+ SAL_INFO("oox.drawingml", "Shape::applyShapeReference: apply '" << rReferencedShape.msId << "' to '" << msId << "'");
if ( rReferencedShape.mpTextBody.get() && bUseText )
mpTextBody = std::make_shared<TextBody>( *rReferencedShape.mpTextBody.get() );
@@ -379,7 +379,7 @@ void Shape::addChildren(
aChildTransformation.translate(aTranslate.getX(), aTranslate.getY());
}
- SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "parent matrix:\n"
+ SAL_INFO("oox.drawingml", "Shape::addChildren: parent matrix:\n"
<< aChildTransformation.get(0, 0) << " "
<< aChildTransformation.get(0, 1) << " "
<< aChildTransformation.get(0, 2) << "\n"
@@ -409,7 +409,7 @@ Reference< XShape > const & Shape::createAndInsert(
FillProperties& rShapeOrParentShapeFillProps )
{
bool bIsEmbMedia = false;
- SAL_INFO("oox.drawingml", OSL_THIS_FUNC << " id: " << msId);
+ SAL_INFO("oox.drawingml", "Shape::createAndInsert: id='" << msId << "' service='" << rServiceName << "'");
formulaimport::XmlStreamBuilder * pMathXml(nullptr);
if (mpTextBody.get())
@@ -619,7 +619,7 @@ Reference< XShape > const & Shape::createAndInsert(
if ( mbHidden || mbHiddenMasterShape )
{
- SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "invisible shape with id: " << msId);
+ SAL_INFO("oox.drawingml", "Shape::createAndInsert: invisible shape with id='" << msId << "'");
const OUString sVisible( "Visible" );
xSet->setPropertyValue( sVisible, Any( false ) );
}
@@ -1085,6 +1085,8 @@ Reference< XShape > const & Shape::createAndInsert(
mpCustomShapePropertiesPtr->setTextRotateAngle( -1 * nTextRotateAngle / 60000 );
}
+ // Note that the script oox/source/drawingml/customshapes/generatePresetsData.pl looks
+ // for these ==cscode== and ==csdata== markers, so don't "clean up" these SAL_INFOs
SAL_INFO("oox.cscode", "==cscode== shape name: '" << msName << "'");
SAL_INFO("oox.csdata", "==csdata== shape name: '" << msName << "'");
mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape, maSize );
@@ -1115,7 +1117,7 @@ Reference< XShape > const & Shape::createAndInsert(
if( pTheme )
if( const TextCharacterProperties* pCharProps = pTheme->getFontStyle( pFontRef->mnThemedIdx ) )
aCharStyleProperties.assignUsed( *pCharProps );
- SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "use font color");
+ SAL_INFO("oox.drawingml", "Shape::createAndInsert: use font color");
if ( pFontRef->maPhClr.isUsed() )
{
aCharStyleProperties.maFillProperties.maFillColor = pFontRef->maPhClr;
@@ -1191,7 +1193,7 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase& rFilterBase )
}
catch( const Exception& e )
{
- SAL_WARN( "oox.drawingml", OSL_THIS_FUNC << "Exception: " << e.Message );
+ SAL_WARN( "oox.drawingml", "Shape::keepDiagramCompatibilityInfo: Exception: " << e.Message );
}
}
@@ -1248,8 +1250,7 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase )
GraphicFilter aFilter( false );
if ( aFilter.ImportGraphic( aGraphic, "", aTempStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast < Sequence < PropertyValue >* > ( nullptr ) ) != GRFILTER_OK )
{
- SAL_WARN( "oox.drawingml", OSL_THIS_FUNC
- << "Unable to import rendered stream into graphic object" );
+ SAL_WARN( "oox.drawingml", "Shape::renderDiagramToGraphic: Unable to import rendered stream into graphic object" );
return xShape;
}
@@ -1264,7 +1265,7 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase )
}
catch( const Exception& e )
{
- SAL_WARN( "oox.drawingml", OSL_THIS_FUNC << "Exception: " << e.Message );
+ SAL_WARN( "oox.drawingml", "Shape::renderDiagramToGraphic: Exception: " << e.Message );
}
return xShape;
@@ -1277,7 +1278,7 @@ void Shape::setTextBody(const TextBodyPtr & pTextBody)
void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle )
{
- SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "set master text list style to shape id: " << msId);
+ SAL_INFO("oox.drawingml", "Shape::setMasterTextListStyle: Set master text list style to shape id='" << msId << "'");
mpMasterTextListStyle = pMasterTextListStyle;
}
More information about the Libreoffice-commits
mailing list