include/oox/core/xmlfilterbase.hxx | 5
include/oox/drawingml/table/tablebackgroundstylecontext.hxx | 47 ----
include/oox/drawingml/table/tablecell.hxx | 115 ----------
include/oox/drawingml/table/tablecellcontext.hxx | 47 ----
include/oox/drawingml/table/tablecontext.hxx | 48 ----
include/oox/drawingml/table/tablepartstylecontext.hxx | 46 ----
include/oox/drawingml/table/tableproperties.hxx | 80 ------
include/oox/drawingml/table/tablerow.hxx | 49 ----
include/oox/drawingml/table/tablerowcontext.hxx | 48 ----
include/oox/drawingml/table/tablestyle.hxx | 85 -------
include/oox/drawingml/table/tablestylecellstylecontext.hxx | 46 ----
include/oox/drawingml/table/tablestylecontext.hxx | 47 ----
include/oox/drawingml/table/tablestylelist.hxx | 54 ----
include/oox/drawingml/table/tablestylelistfragmenthandler.hxx | 56 ----
include/oox/drawingml/table/tablestylepart.hxx | 73 ------
include/oox/drawingml/table/tablestyletextstylecontext.hxx | 47 ----
oox/inc/drawingml/table/tablebackgroundstylecontext.hxx | 47 ++++
oox/inc/drawingml/table/tablecell.hxx | 115 ++++++++++
oox/inc/drawingml/table/tablecellcontext.hxx | 47 ++++
oox/inc/drawingml/table/tablecontext.hxx | 48 ++++
oox/inc/drawingml/table/tablepartstylecontext.hxx | 46 ++++
oox/inc/drawingml/table/tableproperties.hxx | 80 ++++++
oox/inc/drawingml/table/tablerow.hxx | 49 ++++
oox/inc/drawingml/table/tablerowcontext.hxx | 48 ++++
oox/inc/drawingml/table/tablestyle.hxx | 85 +++++++
oox/inc/drawingml/table/tablestylecellstylecontext.hxx | 46 ++++
oox/inc/drawingml/table/tablestylecontext.hxx | 47 ++++
oox/inc/drawingml/table/tablestylelist.hxx | 54 ++++
oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx | 56 ++++
oox/inc/drawingml/table/tablestylepart.hxx | 73 ++++++
oox/inc/drawingml/table/tablestyletextstylecontext.hxx | 47 ++++
oox/source/drawingml/graphicshapecontext.cxx | 2
oox/source/drawingml/shape.cxx | 2
oox/source/drawingml/table/tablebackgroundstylecontext.cxx | 2
oox/source/drawingml/table/tablecell.cxx | 4
oox/source/drawingml/table/tablecellcontext.cxx | 2
oox/source/drawingml/table/tablecontext.cxx | 8
oox/source/drawingml/table/tablepartstylecontext.cxx | 6
oox/source/drawingml/table/tableproperties.cxx | 3
oox/source/drawingml/table/tablerow.cxx | 2
oox/source/drawingml/table/tablerowcontext.cxx | 6
oox/source/drawingml/table/tablestyle.cxx | 2
oox/source/drawingml/table/tablestylecellstylecontext.cxx | 2
oox/source/drawingml/table/tablestylecontext.cxx | 6
oox/source/drawingml/table/tablestylelist.cxx | 4
oox/source/drawingml/table/tablestylelistfragmenthandler.cxx | 4
oox/source/drawingml/table/tablestylepart.cxx | 2
oox/source/drawingml/table/tablestyletextstylecontext.cxx | 2
oox/source/ppt/pptimport.cxx | 2
oox/source/shape/ShapeFilterBase.hxx | 2
ucb/source/ucp/webdav/webdavcontent.cxx | 16 -
ucb/source/ucp/webdav/webdavcontent.hxx | 3
52 files changed, 936 insertions(+), 927 deletions(-)
New commits:
commit 96e23564e95d2ecc5483e55b022c8a4db04d116b
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Mon Jun 23 10:39:49 2014 +0200
webdav: Do not throw when saving new document.
Propagate information about !shouldAccessNetworkAfterException
from getResourceType out to getPropertyValues, to avoid further calls
which would result in cancelCommandExecution, when trying get properties
of document which does not exist yet, but we want to create it.
This was done in webdav-neon for other reasons as part of
0c3500115c4fd86284a027fc32be704afcf77061.
Change-Id: Ia434a707d2946a6982075f9bf53904b78dc07a5e
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index b783e16..dbc13b7 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1371,14 +1371,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( !m_bTransient && !bHasAll )
{
-
// Obtain values from server...
// First, identify whether resource is DAV or not
- const ResourceType & rType = getResourceType( xEnv, xResAccess );
-
bool bNetworkAccessAllowed = true;
+ const ResourceType & rType = getResourceType( xEnv, xResAccess,
&bNetworkAccessAllowed );
if ( DAV == rType )
{
@@ -3321,15 +3319,15 @@ Content::getBaseURI( const boost::scoped_ptr<
DAVResourceAccess > & rResAccess )
const Content::ResourceType & Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv,
- const boost::scoped_ptr< DAVResourceAccess > & rResAccess )
+ const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
+ bool * networkAccessAllowed )
throw ( uno::Exception )
{
if ( m_eResourceType == UNKNOWN )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- ResourceType eResourceType;
- eResourceType = m_eResourceType;
+ ResourceType eResourceType = UNKNOWN;
try
{
@@ -3372,6 +3370,12 @@ const Content::ResourceType & Content::getResourceType(
// resource is NON_DAV
eResourceType = NON_DAV;
}
+ else if (networkAccessAllowed != 0)
+ {
+ *networkAccessAllowed = *networkAccessAllowed
+ && shouldAccessNetworkAfterException(e);
+ }
+
// cancel command execution is case that no user authentication
data has been provided.
if ( e.getError() == DAVException::DAV_HTTP_NOAUTH )
{
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index f9daf3d..04a115b 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -132,7 +132,8 @@ private:
const ResourceType &
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv,
- const boost::scoped_ptr< DAVResourceAccess > & rResAccess
)
+ const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
+ bool * networkAccessAllowed = 0 )
throw ( ::com::sun::star::uno::Exception );
// Command "open"
commit e787a84c69b1e557f32de348d2efd5879c7ca222
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Thu Jun 19 12:09:17 2014 +0200
Move oox/drawingml/table/ internal headers to oox/inc.
Change-Id: I9de33fdcd8b1ef73d57884033f502ac4a03f63d3
diff --git a/include/oox/core/xmlfilterbase.hxx
b/include/oox/core/xmlfilterbase.hxx
index a26bad8..4737cef 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -28,7 +28,6 @@
#include <rtl/ustring.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/core/relations.hxx>
-#include <oox/drawingml/table/tablestylelist.hxx>
#include <oox/dllapi.h>
namespace com { namespace sun { namespace star {
@@ -43,6 +42,10 @@ namespace com { namespace sun { namespace star {
namespace oox {
namespace drawingml { class Theme; }
namespace drawingml { namespace chart { class ChartConverter; } }
+ namespace drawingml { namespace table {
+ class TableStyleList;
+ typedef boost::shared_ptr< TableStyleList > TableStyleListPtr;
+ } }
namespace vml { class Drawing; }
}
diff --git a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
similarity index 97%
rename from include/oox/drawingml/table/tablebackgroundstylecontext.hxx
rename to oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
index 8364965..ae7872e 100644
--- a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
@@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEBACKGROUNDSTYLECONTEXT_HXX
#include <oox/core/contexthandler2.hxx>
-#include <oox/drawingml/table/tablestyle.hxx>
+#include <drawingml/table/tablestyle.hxx>
namespace oox { namespace drawingml { namespace table {
diff --git a/include/oox/drawingml/table/tablecell.hxx
b/oox/inc/drawingml/table/tablecell.hxx
similarity index 100%
rename from include/oox/drawingml/table/tablecell.hxx
rename to oox/inc/drawingml/table/tablecell.hxx
diff --git a/include/oox/drawingml/table/tablecellcontext.hxx
b/oox/inc/drawingml/table/tablecellcontext.hxx
similarity index 97%
rename from include/oox/drawingml/table/tablecellcontext.hxx
rename to oox/inc/drawingml/table/tablecellcontext.hxx
index 78948f0..0ad58d3 100644
--- a/include/oox/drawingml/table/tablecellcontext.hxx
+++ b/oox/inc/drawingml/table/tablecellcontext.hxx
@@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELLCONTEXT_HXX
#include <oox/drawingml/shapecontext.hxx>
-#include <oox/drawingml/table/tablecell.hxx>
+#include <drawingml/table/tablecell.hxx>
namespace oox { namespace drawingml { namespace table {
diff --git a/include/oox/drawingml/table/tablecontext.hxx
b/oox/inc/drawingml/table/tablecontext.hxx
similarity index 100%
rename from include/oox/drawingml/table/tablecontext.hxx
rename to oox/inc/drawingml/table/tablecontext.hxx
diff --git a/include/oox/drawingml/table/tablepartstylecontext.hxx
b/oox/inc/drawingml/table/tablepartstylecontext.hxx
similarity index 96%
rename from include/oox/drawingml/table/tablepartstylecontext.hxx
rename to oox/inc/drawingml/table/tablepartstylecontext.hxx
index b85348f..3b9fab2 100644
--- a/include/oox/drawingml/table/tablepartstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablepartstylecontext.hxx
@@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPARTSTYLECONTEXT_HXX
#include <oox/core/contexthandler2.hxx>
-#include <oox/drawingml/table/tablestylepart.hxx>
+#include <drawingml/table/tablestylepart.hxx>
namespace oox { namespace drawingml { namespace table {
diff --git a/include/oox/drawingml/table/tableproperties.hxx
b/oox/inc/drawingml/table/tableproperties.hxx
similarity index 97%
rename from include/oox/drawingml/table/tableproperties.hxx
rename to oox/inc/drawingml/table/tableproperties.hxx
index 98bb1a1..ea03f75 100644
--- a/include/oox/drawingml/table/tableproperties.hxx
+++ b/oox/inc/drawingml/table/tableproperties.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
-#include <oox/drawingml/table/tablerow.hxx>
-#include <oox/drawingml/table/tablestyle.hxx>
+#include <drawingml/table/tablerow.hxx>
+#include <drawingml/table/tablestyle.hxx>
#include <oox/helper/propertymap.hxx>
#include <oox/drawingml/color.hxx>
diff --git a/include/oox/drawingml/table/tablerow.hxx
b/oox/inc/drawingml/table/tablerow.hxx
similarity index 97%
rename from include/oox/drawingml/table/tablerow.hxx
rename to oox/inc/drawingml/table/tablerow.hxx
index 9e58ddd..29bc2d1 100644
--- a/include/oox/drawingml/table/tablerow.hxx
+++ b/oox/inc/drawingml/table/tablerow.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
-#include <oox/drawingml/table/tablecell.hxx>
+#include <drawingml/table/tablecell.hxx>
#include <vector>
namespace oox { namespace drawingml { namespace table {
diff --git a/include/oox/drawingml/table/tablerowcontext.hxx
b/oox/inc/drawingml/table/tablerowcontext.hxx
similarity index 100%
rename from include/oox/drawingml/table/tablerowcontext.hxx
rename to oox/inc/drawingml/table/tablerowcontext.hxx
diff --git a/include/oox/drawingml/table/tablestyle.hxx
b/oox/inc/drawingml/table/tablestyle.hxx
similarity index 98%
rename from include/oox/drawingml/table/tablestyle.hxx
rename to oox/inc/drawingml/table/tablestyle.hxx
index 8d1c6b8..a0d1044 100644
--- a/include/oox/drawingml/table/tablestyle.hxx
+++ b/oox/inc/drawingml/table/tablestyle.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
-#include <oox/drawingml/table/tablestylepart.hxx>
+#include <drawingml/table/tablestylepart.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/drawingml/shape.hxx>
diff --git a/include/oox/drawingml/table/tablestylecellstylecontext.hxx
b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
similarity index 97%
rename from include/oox/drawingml/table/tablestylecellstylecontext.hxx
rename to oox/inc/drawingml/table/tablestylecellstylecontext.hxx
index d4af4336..4d4844a 100644
--- a/include/oox/drawingml/table/tablestylecellstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
@@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLECELLSTYLECONTEXT_HXX
#include <oox/core/contexthandler2.hxx>
-#include <oox/drawingml/table/tablestylepart.hxx>
+#include <drawingml/table/tablestylepart.hxx>
namespace oox { namespace drawingml { namespace table {
diff --git a/include/oox/drawingml/table/tablestylecontext.hxx
b/oox/inc/drawingml/table/tablestylecontext.hxx
similarity index 97%
rename from include/oox/drawingml/table/tablestylecontext.hxx
rename to oox/inc/drawingml/table/tablestylecontext.hxx
index 32f9220..cf98c0e 100644
--- a/include/oox/drawingml/table/tablestylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestylecontext.hxx
@@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLECONTEXT_HXX
#include <oox/core/contexthandler2.hxx>
-#include <oox/drawingml/table/tablestyle.hxx>
+#include <drawingml/table/tablestyle.hxx>
namespace oox { namespace drawingml { namespace table {
diff --git a/include/oox/drawingml/table/tablestylelist.hxx
b/oox/inc/drawingml/table/tablestylelist.hxx
similarity index 100%
rename from include/oox/drawingml/table/tablestylelist.hxx
rename to oox/inc/drawingml/table/tablestylelist.hxx
diff --git a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
similarity index 97%
rename from include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
rename to oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
index c32c91a..0e7521a 100644
--- a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
+++ b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
-#include <oox/drawingml/table/tablestylelist.hxx>
+#include <drawingml/table/tablestylelist.hxx>
#include <oox/core/fragmenthandler2.hxx>
namespace oox {
diff --git a/include/oox/drawingml/table/tablestylepart.hxx
b/oox/inc/drawingml/table/tablestylepart.hxx
similarity index 100%
rename from include/oox/drawingml/table/tablestylepart.hxx
rename to oox/inc/drawingml/table/tablestylepart.hxx
diff --git a/include/oox/drawingml/table/tablestyletextstylecontext.hxx
b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
similarity index 97%
rename from include/oox/drawingml/table/tablestyletextstylecontext.hxx
rename to oox/inc/drawingml/table/tablestyletextstylecontext.hxx
index 52c6e9a..567afd5 100644
--- a/include/oox/drawingml/table/tablestyletextstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
@@ -22,7 +22,7 @@
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLETEXTSTYLECONTEXT_HXX
#include <oox/core/contexthandler.hxx>
-#include <oox/drawingml/table/tablestylepart.hxx>
+#include <drawingml/table/tablestylepart.hxx>
namespace oox { namespace drawingml { namespace table {
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index db04d5c..8f016be 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -24,7 +24,7 @@
#include "oox/drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/drawingml/customshapeproperties.hxx"
#include "oox/drawingml/diagram/diagram.hxx"
-#include "oox/drawingml/table/tablecontext.hxx"
+#include "drawingml/table/tablecontext.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/graphichelper.hxx"
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 85b8b4d..7b16832 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -25,7 +25,7 @@
#include "effectproperties.hxx"
#include "oox/drawingml/shapepropertymap.hxx"
#include "oox/drawingml/textbody.hxx"
-#include "oox/drawingml/table/tableproperties.hxx"
+#include "drawingml/table/tableproperties.hxx"
#include "oox/drawingml/chart/chartconverter.hxx"
#include "oox/drawingml/chart/chartspacefragment.hxx"
#include "oox/drawingml/chart/chartspacemodel.hxx"
diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
index a561156..a91da19 100644
--- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
+++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
@@ -19,7 +19,7 @@
#include <osl/diagnose.h>
-#include "oox/drawingml/table/tablebackgroundstylecontext.hxx"
+#include "drawingml/table/tablebackgroundstylecontext.hxx"
#include "oox/drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/helper/attributelist.hxx"
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index 53d8b42..6862594 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "oox/drawingml/table/tablecell.hxx"
-#include "oox/drawingml/table/tableproperties.hxx"
+#include "drawingml/table/tablecell.hxx"
+#include "drawingml/table/tableproperties.hxx"
#include "oox/drawingml/shapepropertymap.hxx"
#include "oox/drawingml/textbody.hxx"
#include "oox/core/xmlfilterbase.hxx"
diff --git a/oox/source/drawingml/table/tablecellcontext.cxx
b/oox/source/drawingml/table/tablecellcontext.cxx
index 1813cbb..c0de51f 100644
--- a/oox/source/drawingml/table/tablecellcontext.cxx
+++ b/oox/source/drawingml/table/tablecellcontext.cxx
@@ -19,7 +19,7 @@
#include <osl/diagnose.h>
-#include "oox/drawingml/table/tablecellcontext.hxx"
+#include "drawingml/table/tablecellcontext.hxx"
#include "oox/drawingml/textbodycontext.hxx"
#include "oox/drawingml/linepropertiescontext.hxx"
#include "oox/drawingml/fillpropertiesgroupcontext.hxx"
diff --git a/oox/source/drawingml/table/tablecontext.cxx
b/oox/source/drawingml/table/tablecontext.cxx
index 17949a7..52edb76 100644
--- a/oox/source/drawingml/table/tablecontext.cxx
+++ b/oox/source/drawingml/table/tablecontext.cxx
@@ -20,10 +20,10 @@
#include <osl/diagnose.h>
#include "oox/helper/attributelist.hxx"
#include "oox/drawingml/guidcontext.hxx"
-#include "oox/drawingml/table/tablecontext.hxx"
-#include "oox/drawingml/table/tableproperties.hxx"
-#include "oox/drawingml/table/tablestylecontext.hxx"
-#include "oox/drawingml/table/tablerowcontext.hxx"
+#include "drawingml/table/tablecontext.hxx"
+#include "drawingml/table/tableproperties.hxx"
+#include "drawingml/table/tablestylecontext.hxx"
+#include "drawingml/table/tablerowcontext.hxx"
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tablepartstylecontext.cxx
b/oox/source/drawingml/table/tablepartstylecontext.cxx
index 69282f2..8ba8139 100644
--- a/oox/source/drawingml/table/tablepartstylecontext.cxx
+++ b/oox/source/drawingml/table/tablepartstylecontext.cxx
@@ -19,9 +19,9 @@
#include <osl/diagnose.h>
-#include "oox/drawingml/table/tablepartstylecontext.hxx"
-#include "oox/drawingml/table/tablestyletextstylecontext.hxx"
-#include "oox/drawingml/table/tablestylecellstylecontext.hxx"
+#include "drawingml/table/tablepartstylecontext.hxx"
+#include "drawingml/table/tablestyletextstylecontext.hxx"
+#include "drawingml/table/tablestylecellstylecontext.hxx"
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tableproperties.cxx
b/oox/source/drawingml/table/tableproperties.cxx
index e7f5799..3dbc814 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -17,7 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "oox/drawingml/table/tableproperties.hxx"
+#include "drawingml/table/tableproperties.hxx"
+#include "drawingml/table/tablestylelist.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include <com/sun/star/table/XTable.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
diff --git a/oox/source/drawingml/table/tablerow.cxx
b/oox/source/drawingml/table/tablerow.cxx
index 9fd2a38..48fdd4d 100644
--- a/oox/source/drawingml/table/tablerow.cxx
+++ b/oox/source/drawingml/table/tablerow.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "oox/drawingml/table/tablerow.hxx"
+#include "drawingml/table/tablerow.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/oox/source/drawingml/table/tablerowcontext.cxx
b/oox/source/drawingml/table/tablerowcontext.cxx
index 5984d76..551eb50 100644
--- a/oox/source/drawingml/table/tablerowcontext.cxx
+++ b/oox/source/drawingml/table/tablerowcontext.cxx
@@ -19,9 +19,9 @@
#include <osl/diagnose.h>
-#include "oox/drawingml/table/tablerowcontext.hxx"
-#include "oox/drawingml/table/tablecellcontext.hxx"
-#include "oox/drawingml/table/tablerow.hxx"
+#include "drawingml/table/tablerowcontext.hxx"
+#include "drawingml/table/tablecellcontext.hxx"
+#include "drawingml/table/tablerow.hxx"
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tablestyle.cxx
b/oox/source/drawingml/table/tablestyle.cxx
index cfaad19..42a670f 100644
--- a/oox/source/drawingml/table/tablestyle.cxx
+++ b/oox/source/drawingml/table/tablestyle.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "oox/drawingml/table/tablestyle.hxx"
+#include "drawingml/table/tablestyle.hxx"
namespace oox { namespace drawingml { namespace table {
diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx
b/oox/source/drawingml/table/tablestylecellstylecontext.cxx
index c6be915..a318a0a 100644
--- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx
@@ -19,7 +19,7 @@
#include <osl/diagnose.h>
-#include "oox/drawingml/table/tablestylecellstylecontext.hxx"
+#include "drawingml/table/tablestylecellstylecontext.hxx"
#include "oox/drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/drawingml/linepropertiescontext.hxx"
#include "oox/helper/attributelist.hxx"
diff --git a/oox/source/drawingml/table/tablestylecontext.cxx
b/oox/source/drawingml/table/tablestylecontext.cxx
index 0e6e0de..4651c09 100644
--- a/oox/source/drawingml/table/tablestylecontext.cxx
+++ b/oox/source/drawingml/table/tablestylecontext.cxx
@@ -19,9 +19,9 @@
#include <osl/diagnose.h>
-#include "oox/drawingml/table/tablestylecontext.hxx"
-#include "oox/drawingml/table/tablebackgroundstylecontext.hxx"
-#include "oox/drawingml/table/tablepartstylecontext.hxx"
+#include "drawingml/table/tablestylecontext.hxx"
+#include "drawingml/table/tablebackgroundstylecontext.hxx"
+#include "drawingml/table/tablepartstylecontext.hxx"
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tablestylelist.cxx
b/oox/source/drawingml/table/tablestylelist.cxx
index ed4b8fb..b47375a 100644
--- a/oox/source/drawingml/table/tablestylelist.cxx
+++ b/oox/source/drawingml/table/tablestylelist.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "oox/drawingml/table/tablestylelist.hxx"
-#include "oox/drawingml/table/tablestyle.hxx"
+#include "drawingml/table/tablestylelist.hxx"
+#include "drawingml/table/tablestyle.hxx"
namespace oox { namespace drawingml { namespace table {
diff --git a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
index 0e564e9..7262a42 100644
--- a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
+++ b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "oox/drawingml/table/tablestylelistfragmenthandler.hxx"
-#include "oox/drawingml/table/tablestylecontext.hxx"
+#include "drawingml/table/tablestylelistfragmenthandler.hxx"
+#include "drawingml/table/tablestylecontext.hxx"
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tablestylepart.cxx
b/oox/source/drawingml/table/tablestylepart.cxx
index d5256e7..57fc553 100644
--- a/oox/source/drawingml/table/tablestylepart.cxx
+++ b/oox/source/drawingml/table/tablestylepart.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "oox/drawingml/table/tablestylepart.hxx"
+#include "drawingml/table/tablestylepart.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
using namespace ::oox::core;
diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx
b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
index ba85fea..93277fc 100644
--- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
@@ -19,7 +19,7 @@
#include <osl/diagnose.h>
-#include "oox/drawingml/table/tablestyletextstylecontext.hxx"
+#include "drawingml/table/tablestyletextstylecontext.hxx"
#include "oox/drawingml/colorchoicecontext.hxx"
#include "oox/helper/attributelist.hxx"
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index c3aa2208..6bfb00c 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -23,7 +23,7 @@
#include "oox/ppt/pptimport.hxx"
#include "oox/drawingml/chart/chartconverter.hxx"
#include "oox/dump/pptxdumper.hxx"
-#include "oox/drawingml/table/tablestylelistfragmenthandler.hxx"
+#include "drawingml/table/tablestylelistfragmenthandler.hxx"
#include "oox/helper/graphichelper.hxx"
#include "oox/ole/vbaproject.hxx"
diff --git a/oox/source/shape/ShapeFilterBase.hxx
b/oox/source/shape/ShapeFilterBase.hxx
index 2021e47..f553fd9 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -23,7 +23,7 @@
#include <boost/shared_ptr.hpp>
#include <rtl/ref.hxx>
#include "oox/vml/vmldrawing.hxx"
-#include "oox/drawingml/table/tablestylelist.hxx"
+#include "drawingml/table/tablestylelist.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
