CWS-TOOLING: integrate CWS impress174

2009-08-27 18:21:38 +0200 af  r275502 : #i73289# Fixed detection of the cases when the layout menu is be disabled.
2009-08-24 17:45:50 +0200 sj  r275326 : #i103360# only setting filltype if there is also a correct fill element
2009-08-24 16:11:06 +0200 cl  r275322 : #i73871# only remove replaced objects from mark list if replaced by SdrEditView::ReplaceObjectAtView(). see issue for reason
2009-08-24 15:03:33 +0200 cl  r275319 : fixed merge error
2009-08-20 12:45:29 +0200 sj  r275174 : CWS-TOOLING: rebase CWS impress174 to trunk@275001 (milestone: DEV300:m55)
2009-08-19 15:54:47 +0200 sj  r275153 : #158486# text of flipped shapes is not flipped in word
2009-08-17 17:30:16 +0200 sj  r275063 : #158486# also correcting text bound for additional text rotation
2009-08-05 11:09:32 +0200 sj  r274643 : #i102797# adapted customshape coloring (fixed fontwork)
2009-08-04 14:17:36 +0200 sj  r274620 : #i99501# pdf export: fixed export of rotated graphics
2009-07-30 16:15:44 +0200 sj  r274494 : #158653# binary ppt import: fixed table border lines
2009-07-27 18:28:02 +0200 sj  r274376 : added shape text clipping for customshapes
2009-07-20 18:09:14 +0200 sj  r274154 : #i101918# fixed gallery preview (now taking the correct mapmode)
2009-07-13 18:00:58 +0200 cl  r273948 : #i103238# clear hard set attributes only if new style set is manually applied
2009-07-13 17:58:07 +0200 cl  r273947 : #i73289# do not expand a toolpanel when it gets enabled
2009-07-08 12:39:49 +0200 sj  r273827 : #i101566# applied patch from cmc to solve font width inconsistencies
2009-07-08 12:11:13 +0200 sj  r273826 : #i87727# added PDFDialog service
2009-07-06 17:22:40 +0200 sj  r273755 : #i103360# fixed a merge problem, no more looping when loading transparence gradients on background page
2009-07-03 14:42:07 +0200 sj  r273701 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 14:09:44 +0200 sj  r273696 : #102797# removed warning
2009-07-03 14:01:47 +0200 sj  r273695 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 13:13:39 +0200 sj  r273688 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 11:25:30 +0200 sj  r273684 : #i103278# fixed import of lines
2009-07-01 16:23:47 +0200 cl  r273599 : #i96820# correctly call setChanged on model if table is modified
2009-07-01 14:43:09 +0200 cl  r273588 : #i8770# Patch: fix missing type provider for pdf export dialog
2009-07-01 14:40:28 +0200 cl  r273586 : #i73871# activate picture bar after converting shape to bitmap
2009-07-01 14:39:05 +0200 cl  r273584 : #i73871# activate picture bar after converting shape to bitmap
2009-07-01 14:04:53 +0200 cl  r273578 : #i73289# PATCH: Disable layout pane on the masterslide

3 files changed, 19 insertions, 50 deletions

diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index ab8b85dce..484395f6a 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -97,8 +97,8 @@ Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMul
 // - PDFDialog -
 // -------------
 
-PDFDialog::PDFDialog( const Reference< XMultiServiceFactory > &rxMSF ) :
-    OGenericUnoDialog( rxMSF )
+PDFDialog::PDFDialog( const Reference< XMultiServiceFactory > &rxMSF )
+: PDFDialog_Base( rxMSF )
 {
     ByteString aResMgrName( "pdffilter" );
 
@@ -114,37 +114,6 @@ PDFDialog::~PDFDialog()
 
 // -----------------------------------------------------------------------------
 
-Any SAL_CALL PDFDialog::queryInterface( const Type& rType ) 
-    throw (RuntimeException)
-{
-    Any aReturn = OGenericUnoDialog::queryInterface( rType );
-
-    if( !aReturn.hasValue() )
-        aReturn = ::cppu::queryInterface( rType, 
-                                          static_cast< XPropertyAccess* >( this ),
-                                          static_cast< XExporter* >( this ) );
-
-    return aReturn;
-}
-
-// -----------------------------------------------------------------------------
-
-void SAL_CALL PDFDialog::acquire() 
-    throw ()
-{
-    OWeakObject::acquire();
-}
-
-// -----------------------------------------------------------------------------
-
-void SAL_CALL PDFDialog::release() 
-    throw ()
-{
-    OWeakObject::release();
-}
-
-// -----------------------------------------------------------------------------
-
 Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() 
     throw(RuntimeException)
 {
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index 399a4b112..fc6acdda1 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -34,6 +34,8 @@
 #include "pdffilter.hxx"
 #include <svtools/genericunodialog.hxx>
 
+#include <cppuhelper/implbase2.hxx>

+
 // -------------
 // - PDFDialog -
 // -------------
@@ -41,10 +43,15 @@
 class Window;
 class ResMgr;
 
-class PDFDialog : public ::svt::OGenericUnoDialog,
-                  public ::comphelper::OPropertyArrayUsageHelper< PDFDialog >,
-                  public XPropertyAccess,
-                  public XExporter
+typedef ::svt::OGenericUnoDialog             PDFDialog_DialogBase;

+typedef ::cppu::ImplInheritanceHelper2  <

+                                             PDFDialog_DialogBase,

+                                             XPropertyAccess,

+                                             XExporter

+                                        >    PDFDialog_Base;

+

+class PDFDialog : public PDFDialog_Base,

+                  public ::comphelper::OPropertyArrayUsageHelper< PDFDialog >

 {
 private:
 
@@ -54,12 +61,6 @@ private:
     Reference< XComponent >     mxSrcDoc;
 
 protected:
-
-    // XInterface
-    virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException);
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
-
     // OGenericUnoDialog
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException);
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException);
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index 1e27dcd60..cdeed26f1 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -271,15 +271,14 @@ Reference< XFastContextHandler > FillPropertiesContext::createFastChildContext(
         ContextHandler& rParent, sal_Int32 nElement,
         const Reference< XFastAttributeList >& rxAttribs, FillProperties& rFillProps )
 {
-    rFillProps.moFillType = getToken( nElement );
     switch( nElement )
     {
-        case A_TOKEN( noFill ):     return 0;
-        case A_TOKEN( solidFill ):  return new SolidFillContext( rParent, rxAttribs, rFillProps );
-        case A_TOKEN( gradFill ):   return new GradientFillContext( rParent, rxAttribs, rFillProps.maGradientProps );
-        case A_TOKEN( pattFill ):   return new PatternFillContext( rParent, rxAttribs, rFillProps.maPatternProps );
-        case A_TOKEN( blipFill ):   return new BlipFillContext( rParent, rxAttribs, rFillProps.maBlipProps );
-        case A_TOKEN( grpFill ):    return 0;   // TODO
+        case A_TOKEN( noFill ):			{ rFillProps.moFillType = getToken( nElement ); return 0; };
+        case A_TOKEN( solidFill ):		{ rFillProps.moFillType = getToken( nElement ); return new SolidFillContext( rParent, rxAttribs, rFillProps ); };
+        case A_TOKEN( gradFill ):		{ rFillProps.moFillType = getToken( nElement ); return new GradientFillContext( rParent, rxAttribs, rFillProps.maGradientProps ); };
+        case A_TOKEN( pattFill ):		{ rFillProps.moFillType = getToken( nElement ); return new PatternFillContext( rParent, rxAttribs, rFillProps.maPatternProps ); };
+        case A_TOKEN( blipFill ):		{ rFillProps.moFillType = getToken( nElement ); return new BlipFillContext( rParent, rxAttribs, rFillProps.maBlipProps ); };
+        case A_TOKEN( grpFill ):		{ rFillProps.moFillType = getToken( nElement ); return 0; };	// TODO 
     }
     return 0;
 }