CWS-TOOLING: integrate CWS cmcfixes69ooo/DEV300_m71

4 files changed, 1 insertions, 40 deletions

diff --git a/binfilter/bf_sw/source/core/attr/sw_format.cxx b/binfilter/bf_sw/source/core/attr/sw_format.cxx
index 083e08614..b668dbfcb 100644
--- a/binfilter/bf_sw/source/core/attr/sw_format.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_format.cxx
@@ -636,19 +636,4 @@ namespace binfilter {
 /*M*/     return sal_False;
 /*M*/ }
 
-/** SwFmt::IsShadowTransparent - for feature #99657#
-
-    OD 22.08.2002
-    Virtual method to determine, if shadow of format is transparent.
-    Default implementation returns false. Thus, subclasses have to overload
-    method, if the specific subclass can have a transparent shadow.
-
-    @author OD
-
-    @return false, default implementation
-*/
-/*M*/ sal_Bool SwFmt::IsShadowTransparent() const
-/*M*/ {
-/*M*/     return sal_False;
-/*M*/ }
 }
diff --git a/binfilter/bf_sw/source/core/inc/flyfrm.hxx b/binfilter/bf_sw/source/core/inc/flyfrm.hxx
index 41ac764a6..991f08852 100644
--- a/binfilter/bf_sw/source/core/inc/flyfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/flyfrm.hxx
@@ -216,18 +216,6 @@ public:
         graphic is transparent.
     */
     sal_Bool IsBackgroundTransparent() const;
-
-    /** SwFlyFrm::IsShadowTransparent - for feature #99657#
-
-        OD 05.08.2002
-        determine, if shadow color of fly frame has to be drawn transparent
-        definition found in /core/layout/paintfrm.cxx
-
-        @author OD
-
-        @return true, if shadow color is transparent.
-    */
-    sal_Bool IsShadowTransparent() const;
 };
 
 inline BOOL SwFlyFrm::IsUpperOf( const SwFlyFrm *pLower ) const
diff --git a/binfilter/inc/bf_sw/format.hxx b/binfilter/inc/bf_sw/format.hxx
index 33509284e..44825ff16 100644
--- a/binfilter/inc/bf_sw/format.hxx
+++ b/binfilter/inc/bf_sw/format.hxx
@@ -302,19 +302,6 @@ public:
         @return false, default implementation
     */
     virtual sal_Bool IsBackgroundTransparent() const;
-
-    /** SwFmt::IsShadowTransparent - for feature #99657#
-
-        OD 22.08.2002
-        Virtual method to determine, if shadow of format is transparent.
-        Default implementation returns false. Thus, subclasses have to overload
-        method, if the specific subclass can have a transparent shadow.
-
-        @author OD
-
-        @return false, default implementation
-    */
-    sal_Bool IsShadowTransparent() const;
 };
 
 // --------------- Inline Implementierungen ------------------------
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index d469fdc32..d4bae3e34 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -422,6 +422,7 @@ void OOXMLPropertySetImpl::resolve(Properties & rHandler)
             debug_logger->startElement("error");
             debug_logger->chars("zero-property");
             debug_logger->endElement("error");
+        }
 #endif
 
         aIt++;