You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/01/21 11:13:31 UTC

svn commit: r1436255 - in /openoffice/trunk/main: registry/tools/ svgio/inc/svgio/svgreader/ svgio/source/svgreader/ sw/inc/ sw/source/core/doc/ sw/source/filter/inc/ ucb/source/ucp/webdav/ xmloff/source/core/

Author: hdu
Date: Mon Jan 21 10:13:30 2013
New Revision: 1436255

URL: http://svn.apache.org/viewvc?rev=1436255&view=rev
Log:
type qualifiers ignored on function return type

Gcc 4.4 on our buildbot reported 657 such warnings, which represents
almost 85% of all warnings it emitted for our codebase! The warnings
are correct and cleaning them up improves our code quality and makes
the build output more relevant.

Modified:
    openoffice/trunk/main/registry/tools/rdbedit.cxx
    openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
    openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
    openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx
    openoffice/trunk/main/sw/inc/fmtclds.hxx
    openoffice/trunk/main/sw/source/core/doc/docbm.cxx
    openoffice/trunk/main/sw/source/filter/inc/fltshell.hxx
    openoffice/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.cxx
    openoffice/trunk/main/xmloff/source/core/xmlimp.cxx

Modified: openoffice/trunk/main/registry/tools/rdbedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/registry/tools/rdbedit.cxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/registry/tools/rdbedit.cxx (original)
+++ openoffice/trunk/main/registry/tools/rdbedit.cxx Mon Jan 21 10:13:30 2013
@@ -122,7 +122,7 @@ public:
 		{ return m_typeRegName; }
 	const OString& getKeyName()
 		{ return m_keyName; }
-	const Command getCommand()
+	Command getCommand()
 		{ return m_command; }
 	bool verbose()
 		{ return m_bVerbose; }	

Modified: openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx (original)
+++ openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx Mon Jan 21 10:13:30 2013
@@ -290,11 +290,11 @@ namespace svgio
             void setStopColor(const SvgPaint& rStopColor) { maStopColor = rStopColor; }
 
             /// stroke-width content
-            const SvgNumber getStrokeWidth() const;
+            SvgNumber getStrokeWidth() const;
             void setStrokeWidth(const SvgNumber& rStrokeWidth = SvgNumber()) { maStrokeWidth = rStrokeWidth; }
 
             /// stop opacity content
-            const SvgNumber getStopOpacity() const;
+            SvgNumber getStopOpacity() const;
             void setStopOpacity(const SvgNumber& rStopOpacity = SvgNumber()) { maStopOpacity = rStopOpacity; }
 
             /// access to evtl. set fill gradient
@@ -314,11 +314,11 @@ namespace svgio
             void setSvgPatternNodeStroke(const SvgPatternNode* pNew) { mpSvgPatternNodeStroke = pNew; }
 
             /// fill opacity content
-            const SvgNumber getFillOpacity() const;
+            SvgNumber getFillOpacity() const;
             void setFillOpacity(const SvgNumber& rFillOpacity = SvgNumber()) { maFillOpacity = rFillOpacity; }
 
             /// fill rule content
-            const FillRule getFillRule() const;
+            FillRule getFillRule() const;
             void setFillRule(const FillRule aFillRule = FillRule_notset) { maFillRule = aFillRule; }
 
             /// fill StrokeDasharray content
@@ -330,7 +330,7 @@ namespace svgio
             void setStrokeDasharraySet(bool bNew) { mbStrokeDasharraySet = bNew; }
 
             /// StrokeDashOffset content
-            const SvgNumber getStrokeDashOffset() const;
+            SvgNumber getStrokeDashOffset() const;
             void setStrokeDashOffset(const SvgNumber& rStrokeDashOffset = SvgNumber()) { maStrokeDashOffset = rStrokeDashOffset; }
 
             /// StrokeLinecap content
@@ -342,11 +342,11 @@ namespace svgio
             void setStrokeLinejoin(const StrokeLinejoin aStrokeLinejoin = StrokeLinejoin_notset) { maStrokeLinejoin = aStrokeLinejoin; }
 
             /// StrokeMiterLimit content
-            const SvgNumber getStrokeMiterLimit() const;
+            SvgNumber getStrokeMiterLimit() const;
             void setStrokeMiterLimit(const SvgNumber& rStrokeMiterLimit = SvgNumber()) { maStrokeMiterLimit = rStrokeMiterLimit; }
 
             /// StrokeOpacity content
-            const SvgNumber getStrokeOpacity() const;
+            SvgNumber getStrokeOpacity() const;
             void setStrokeOpacity(const SvgNumber& rStrokeOpacity = SvgNumber()) { maStrokeOpacity = rStrokeOpacity; }
 
             /// Font content
@@ -354,7 +354,7 @@ namespace svgio
             void setFontFamily(const SvgStringVector& rSvgStringVector = SvgStringVector()) { maFontFamily = rSvgStringVector; }
 
             /// FontSize content
-            const SvgNumber getFontSize() const;
+            SvgNumber getFontSize() const;
             void setFontSize(const SvgNumber& rFontSize = SvgNumber()) { maFontSize = rFontSize; }
 
             /// FontStretch content
@@ -391,7 +391,7 @@ namespace svgio
             void setColor(const SvgPaint& rColor) { maColor = rColor; }
 
             /// Opacity content
-            const SvgNumber getOpacity() const { return maOpacity; }
+            SvgNumber getOpacity() const { return maOpacity; }
             void setOpacity(const SvgNumber& rOpacity = SvgNumber()) { maOpacity = rOpacity; }
 
             // Title content
@@ -403,25 +403,25 @@ namespace svgio
             void setDesc(const rtl::OUString& rNew) { maDesc = rNew; }
 
             // ClipPathXLink content
-            const rtl::OUString getClipPathXLink() const { return maClipPathXLink; }
+            const rtl::OUString& getClipPathXLink() const { return maClipPathXLink; }
             void setClipPathXLink(const rtl::OUString& rNew) { maClipPathXLink = rNew; }
 
             // MaskXLink content
-            const rtl::OUString getMaskXLink() const { return maMaskXLink; }
+            const rtl::OUString& getMaskXLink() const { return maMaskXLink; }
             void setMaskXLink(const rtl::OUString& rNew) { maMaskXLink = rNew; }
 
             // MarkerStartXLink content
-            const rtl::OUString getMarkerStartXLink() const;
+            rtl::OUString getMarkerStartXLink() const;
             const SvgMarkerNode* accessMarkerStartXLink() const;
             void setMarkerStartXLink(const rtl::OUString& rNew) { maMarkerStartXLink = rNew; }
 
             // MarkerMidXLink content
-            const rtl::OUString getMarkerMidXLink() const;
+            rtl::OUString getMarkerMidXLink() const;
             const SvgMarkerNode* accessMarkerMidXLink() const;
             void setMarkerMidXLink(const rtl::OUString& rNew) { maMarkerMidXLink = rNew; }
 
             // MarkerEndXLink content
-            const rtl::OUString getMarkerEndXLink() const;
+            rtl::OUString getMarkerEndXLink() const;
             const SvgMarkerNode* accessMarkerEndXLink() const;
             void setMarkerEndXLink(const rtl::OUString& rNew) { maMarkerEndXLink = rNew; }
 

Modified: openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx (original)
+++ openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx Mon Jan 21 10:13:30 2013
@@ -1960,7 +1960,7 @@ namespace svgio
             return 0;
         }
 
-        const SvgNumber SvgStyleAttributes::getStrokeWidth() const 
+        SvgNumber SvgStyleAttributes::getStrokeWidth() const 
         { 
             if(mbIsClipPathContent)
             {
@@ -1982,7 +1982,7 @@ namespace svgio
             return SvgNumber(1.0); 
         }
 
-        const SvgNumber SvgStyleAttributes::getStopOpacity() const 
+        SvgNumber SvgStyleAttributes::getStopOpacity() const 
         { 
             if(maStopOpacity.isSet()) 
             {
@@ -1993,7 +1993,7 @@ namespace svgio
             return SvgNumber(1.0); 
         }
 
-        const SvgNumber SvgStyleAttributes::getFillOpacity() const 
+        SvgNumber SvgStyleAttributes::getFillOpacity() const 
         { 
             if(mbIsClipPathContent)
             {
@@ -2015,7 +2015,7 @@ namespace svgio
             return SvgNumber(1.0); 
         }
 
-        const FillRule SvgStyleAttributes::getFillRule() const
+        FillRule SvgStyleAttributes::getFillRule() const
         {
             if(FillRule_notset != maFillRule)
             {
@@ -2056,7 +2056,7 @@ namespace svgio
             return maStrokeDasharray; 
         }
 
-        const SvgNumber SvgStyleAttributes::getStrokeDashOffset() const 
+        SvgNumber SvgStyleAttributes::getStrokeDashOffset() const 
         { 
             if(maStrokeDashOffset.isSet()) 
             {
@@ -2110,7 +2110,7 @@ namespace svgio
             return StrokeLinejoin_miter; 
         }
 
-        const SvgNumber SvgStyleAttributes::getStrokeMiterLimit() const 
+        SvgNumber SvgStyleAttributes::getStrokeMiterLimit() const 
         { 
             if(maStrokeMiterLimit.isSet()) 
             {
@@ -2128,7 +2128,7 @@ namespace svgio
             return SvgNumber(4.0); 
         }
 
-        const SvgNumber SvgStyleAttributes::getStrokeOpacity() const 
+        SvgNumber SvgStyleAttributes::getStrokeOpacity() const 
         { 
             if(maStrokeOpacity.isSet()) 
             {
@@ -2164,7 +2164,7 @@ namespace svgio
             return maFontFamily; 
         }
 
-        const SvgNumber SvgStyleAttributes::getFontSize() const 
+        SvgNumber SvgStyleAttributes::getFontSize() const 
         { 
             if(maFontSize.isSet()) 
             {
@@ -2360,7 +2360,7 @@ namespace svgio
             return 0;
         }
 
-        const rtl::OUString SvgStyleAttributes::getMarkerStartXLink() const 
+        rtl::OUString SvgStyleAttributes::getMarkerStartXLink() const 
         { 
             if(maMarkerStartXLink.getLength())
             {
@@ -2392,7 +2392,7 @@ namespace svgio
             return mpMarkerStartXLink;
         }
 
-        const rtl::OUString SvgStyleAttributes::getMarkerMidXLink() const 
+        rtl::OUString SvgStyleAttributes::getMarkerMidXLink() const 
         { 
             if(maMarkerMidXLink.getLength())
             {
@@ -2424,7 +2424,7 @@ namespace svgio
             return mpMarkerMidXLink;
         }
 
-        const rtl::OUString SvgStyleAttributes::getMarkerEndXLink() const 
+        rtl::OUString SvgStyleAttributes::getMarkerEndXLink() const 
         { 
             if(maMarkerEndXLink.getLength())
             {

Modified: openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx (original)
+++ openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx Mon Jan 21 10:13:30 2013
@@ -241,8 +241,8 @@ class IDocumentMarkAccess
         // Returns the MarkType used to create the mark
         static MarkType SAL_DLLPUBLIC_EXPORT GetType(const ::sw::mark::IMark& rMark);
 
-        static const ::rtl::OUString SAL_DLLPUBLIC_EXPORT & GetCrossRefHeadingBookmarkNamePrefix();
-        static const bool SAL_DLLPUBLIC_EXPORT IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM );
+        static const ::rtl::OUString& SAL_DLLPUBLIC_EXPORT GetCrossRefHeadingBookmarkNamePrefix();
+        static bool SAL_DLLPUBLIC_EXPORT IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& );
     protected:
         virtual ~IDocumentMarkAccess() {};
 };

Modified: openoffice/trunk/main/sw/inc/fmtclds.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/fmtclds.hxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/fmtclds.hxx (original)
+++ openoffice/trunk/main/sw/inc/fmtclds.hxx Mon Jan 21 10:13:30 2013
@@ -101,7 +101,7 @@ public:
 	SwFmtCol( const SwFmtCol& );
 	~SwFmtCol();
 	//i120133
-	const	sal_Int16 GetAdjustValue() const { return aWidthAdjustValue; }
+	sal_Int16 GetAdjustValue() const { return aWidthAdjustValue; }
 	void	SetAdjustValue( const sal_Int16& n ) { aWidthAdjustValue = n; }
 
 	SwFmtCol& operator=( const SwFmtCol& );

Modified: openoffice/trunk/main/sw/source/core/doc/docbm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docbm.cxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/docbm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docbm.cxx Mon Jan 21 10:13:30 2013
@@ -302,7 +302,7 @@ const ::rtl::OUString& IDocumentMarkAcce
     return CrossRefHeadingBookmarkNamePrefix;
 }
 
-const bool SAL_DLLPUBLIC_EXPORT IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
+bool SAL_DLLPUBLIC_EXPORT IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
 {
     bool bRet( false );
 

Modified: openoffice/trunk/main/sw/source/filter/inc/fltshell.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/inc/fltshell.hxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/inc/fltshell.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/inc/fltshell.hxx Mon Jan 21 10:13:30 2013
@@ -259,7 +259,7 @@ public:
     long GetHandle() const 				{ return mnHandle; }
     const String& GetName() const 		{ return maName; }
     const String& GetValSys() const 	{ return maVal; }
-    const bool IsTOCBookmark() const
+    bool IsTOCBookmark() const
     {
         return mbIsTOCBookmark;
     }

Modified: openoffice/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.cxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.cxx (original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.cxx Mon Jan 21 10:13:30 2013
@@ -180,8 +180,8 @@ namespace
 
         const ::rtl::OUString& getNamespace() const { return maNamespace; }
         const ::rtl::OUString& getName() const { return maName; }
-        const WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; }
-        const WebDAVName getWebDAVName() const { return maWebDAVName; }
+        WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; }
+        WebDAVName getWebDAVName() const { return maWebDAVName; }
     };
 
     void WebDAVContext::parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs)

Modified: openoffice/trunk/main/xmloff/source/core/xmlimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/core/xmlimp.cxx?rev=1436255&r1=1436254&r2=1436255&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/core/xmlimp.cxx (original)
+++ openoffice/trunk/main/xmloff/source/core/xmlimp.cxx Mon Jan 21 10:13:30 2013
@@ -210,7 +210,7 @@ namespace
             ~DocumentInfo()
             {}        
 
-            const sal_uInt16 getGeneratorVersion() const
+            sal_uInt16 getGeneratorVersion() const
             {
                 return mnGeneratorVersion;        
             }
@@ -278,7 +278,7 @@ public:
 	}
 
     // --> ORW
-    const sal_uInt16 getGeneratorVersion( const SvXMLImport& rImport )
+    sal_uInt16 getGeneratorVersion( const SvXMLImport& rImport )
     {
         if ( !mpDocumentInfo.get() )
         {