| 1 |
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx |
| 2 |
index f88069b..4e578a9 100644 |
| 3 |
--- a/basegfx/source/polygon/b2dpolygon.cxx |
| 4 |
+++ b/basegfx/source/polygon/b2dpolygon.cxx |
| 5 |
@@ -257,6 +257,8 @@ class ControlVectorPair2D |
| 6 |
basegfx::B2DVector maNextVector; |
| 7 |
|
| 8 |
public: |
| 9 |
+ ControlVectorPair2D() {} |
| 10 |
+ |
| 11 |
const basegfx::B2DVector& getPrevVector() const |
| 12 |
{ |
| 13 |
return maPrevVector; |
| 14 |
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx |
| 15 |
index 978f31e..674003f 100644 |
| 16 |
--- a/basegfx/source/range/b2drangeclipper.cxx |
| 17 |
+++ b/basegfx/source/range/b2drangeclipper.cxx |
| 18 |
@@ -600,7 +600,6 @@ namespace basegfx |
| 19 |
std::vector<B2DRange>::const_reverse_iterator aCurrRectR=rRanges.rbegin(); |
| 20 |
std::vector<B2VectorOrientation>::const_reverse_iterator aCurrOrientationR=rOrientations.rbegin(); |
| 21 |
const std::vector<B2DRange>::const_reverse_iterator aEndR=rRanges.rend(); |
| 22 |
- const std::vector<B2VectorOrientation>::const_reverse_iterator aEndOrientationR=rOrientations.rend(); |
| 23 |
while( aCurrRectR != aEndR ) |
| 24 |
{ |
| 25 |
|
| 26 |
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx |
| 27 |
index 7f5ed07..51b8740 100644 |
| 28 |
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx |
| 29 |
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx |
| 30 |
@@ -787,9 +787,9 @@ namespace basegfx |
| 31 |
// (since |
| 32 |
// createPolygonFromEllipseSegment() |
| 33 |
// normalizes to e.g. cw arc) |
| 34 |
- const bool bFlipSegment( (bLargeArcFlag!=0) == |
| 35 |
- (fmod(fTheta2+2*M_PI-fTheta1, |
| 36 |
- 2*M_PI)<M_PI) ); |
| 37 |
+ const bool bLessThanPi(fmod(fTheta2+2*M_PI-fTheta1, |
| 38 |
+ 2*M_PI)<M_PI); |
| 39 |
+ const bool bFlipSegment( (bLargeArcFlag!=0) == bLessThanPi ); |
| 40 |
if( bFlipSegment ) |
| 41 |
std::swap(fTheta1,fTheta2); |
| 42 |
|
| 43 |
diff --git a/cosv/inc/cosv/tpl/vvector.hxx b/cosv/inc/cosv/tpl/vvector.hxx |
| 44 |
index 4848d97..1903dce 100644 |
| 45 |
--- a/cosv/inc/cosv/tpl/vvector.hxx |
| 46 |
+++ b/cosv/inc/cosv/tpl/vvector.hxx |
| 47 |
@@ -132,7 +132,7 @@ class VirtualVector |
| 48 |
typedef VirtualVector<XX,PTRDEL> self; |
| 49 |
typedef std::vector< DYN XX* > impl_type; |
| 50 |
typedef typename impl_type::size_type size_type; |
| 51 |
- typedef ptrdiff_t difference_type; |
| 52 |
+ typedef std::ptrdiff_t difference_type; |
| 53 |
|
| 54 |
class const_iterator; |
| 55 |
class iterator; |
| 56 |
diff --git a/autodoc/source/display/idl/hi_linkhelper.hxx b/autodoc/source/display/idl/hi_linkhelper.hxx |
| 57 |
index c08be55..1cdfaa7 100644 |
| 58 |
--- a/autodoc/source/display/idl/hi_linkhelper.hxx |
| 59 |
+++ b/autodoc/source/display/idl/hi_linkhelper.hxx |
| 60 |
@@ -85,9 +85,7 @@ class LinkHelper |
| 61 |
const String & XrefsSuffix() const; |
| 62 |
|
| 63 |
private: |
| 64 |
- // DATA |
| 65 |
- mutable HtmlEnvironment_Idl & |
| 66 |
- rEnv; |
| 67 |
+ HtmlEnvironment_Idl & rEnv; |
| 68 |
}; |
| 69 |
|
| 70 |
inline const ary::idl::CodeEntity * |
| 71 |
diff --git a/autodoc/inc/ary/idl/i_ce2s.hxx b/autodoc/inc/ary/idl/i_ce2s.hxx |
| 72 |
index c490980..efb2711 100644 |
| 73 |
--- a/autodoc/inc/ary/idl/i_ce2s.hxx |
| 74 |
+++ b/autodoc/inc/ary/idl/i_ce2s.hxx |
| 75 |
@@ -51,6 +51,7 @@ class Ce_2s |
| 76 |
{ |
| 77 |
public: |
| 78 |
// LIFECYCLE |
| 79 |
+ Ce_2s() {} |
| 80 |
virtual ~Ce_2s(); |
| 81 |
|
| 82 |
static DYN Ce_2s * Create_( |
| 83 |
diff --git a/unotools/inc/unotools/streamwrap.hxx b/unotools/inc/unotools/streamwrap.hxx |
| 84 |
index 80cde76..4b53500 100644 |
| 85 |
--- a/unotools/inc/unotools/streamwrap.hxx |
| 86 |
+++ b/unotools/inc/unotools/streamwrap.hxx |
| 87 |
@@ -51,7 +51,7 @@ namespace utl |
| 88 |
//================================================================== |
| 89 |
typedef ::cppu::WeakImplHelper1 < stario::XInputStream |
| 90 |
> InputStreamWrapper_Base; |
| 91 |
- // needed for some compilers |
| 92 |
+// needed for some compilers |
| 93 |
/// helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XInputStream</type> |
| 94 |
class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base |
| 95 |
{ |
| 96 |
@@ -69,9 +69,6 @@ public: |
| 97 |
OInputStreamWrapper(SvStream* pStream, sal_Bool bOwner=sal_False); |
| 98 |
virtual ~OInputStreamWrapper(); |
| 99 |
|
| 100 |
-// UNO Anbindung |
| 101 |
- DECLARE_UNO3_AGG_DEFAULTS(OInputStreamWrapper, InputStreamWrapper_Base); |
| 102 |
- |
| 103 |
// stario::XInputStream |
| 104 |
virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 105 |
virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 106 |
@@ -122,9 +119,6 @@ protected: |
| 107 |
public: |
| 108 |
OOutputStreamWrapper(SvStream& _rStream) :rStream(_rStream) { } |
| 109 |
|
| 110 |
-// UNO Anbindung |
| 111 |
- DECLARE_UNO3_AGG_DEFAULTS(OOutputStreamWrapper, OutputStreamWrapper_Base); |
| 112 |
- |
| 113 |
// stario::XOutputStream |
| 114 |
virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 115 |
virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 116 |
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx |
| 117 |
index fde03ae..ead40ff 100644 |
| 118 |
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx |
| 119 |
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx |
| 120 |
@@ -235,10 +235,7 @@ public: |
| 121 |
|
| 122 |
sal_uInt32 GetFlag(){ return m_nFlag; } |
| 123 |
|
| 124 |
- /** |
| 125 |
- * @descr return margins. |
| 126 |
- */ |
| 127 |
- XFMargins GetMargins(){return m_aMargin;} |
| 128 |
+ XFMargins& GetMargins(){return m_aMargin;} |
| 129 |
|
| 130 |
virtual enumXFStyle GetStyleFamily(); |
| 131 |
|
| 132 |
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx |
| 133 |
index 3927da9..93b1706 100644 |
| 134 |
--- a/chart2/source/controller/main/ChartController.hxx |
| 135 |
+++ b/chart2/source/controller/main/ChartController.hxx |
| 136 |
@@ -545,7 +545,7 @@ private: |
| 137 |
TheModel* operator->() const { return m_pTheModel; } |
| 138 |
private: |
| 139 |
TheModel* m_pTheModel; |
| 140 |
- mutable ::osl::Mutex& m_rModelMutex; |
| 141 |
+ ::osl::Mutex& m_rModelMutex; |
| 142 |
}; |
| 143 |
|
| 144 |
private: |
| 145 |
diff --git a/writerperfect/source/filter/Style.hxx b/writerperfect/source/filter/Style.hxx |
| 146 |
index 2820415..d54f0c8 100644 |
| 147 |
--- a/writerperfect/source/filter/Style.hxx |
| 148 |
+++ b/writerperfect/source/filter/Style.hxx |
| 149 |
@@ -34,7 +34,7 @@ |
| 150 |
class TopLevelElementStyle |
| 151 |
{ |
| 152 |
public: |
| 153 |
- TopLevelElementStyle() : mpsMasterPageName(NULL) { } |
| 154 |
+ TopLevelElementStyle() : mpsMasterPageName(0) { } |
| 155 |
virtual ~TopLevelElementStyle() { if (mpsMasterPageName) delete mpsMasterPageName; } |
| 156 |
void setMasterPageName(WPXString &sMasterPageName) { mpsMasterPageName = new WPXString(sMasterPageName); } |
| 157 |
const WPXString * getMasterPageName() const { return mpsMasterPageName; } |
| 158 |
diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx |
| 159 |
index 369a7bb..2a1a2ce 100644 |
| 160 |
--- a/filter/source/xmlfilteradaptor/streamwrap.hxx |
| 161 |
+++ b/filter/source/xmlfilteradaptor/streamwrap.hxx |
| 162 |
@@ -34,13 +34,6 @@ |
| 163 |
#include <com/sun/star/io/XSeekable.hpp> |
| 164 |
#include <cppuhelper/implbase1.hxx> |
| 165 |
|
| 166 |
-#define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \ |
| 167 |
-virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ |
| 168 |
-virtual void SAL_CALL release() throw() { baseclass::release(); } \ |
| 169 |
-virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ |
| 170 |
-{ return baseclass::queryInterface(_rType); } \ |
| 171 |
-void SAL_CALL PUT_SEMICOLON_AT_THE_END() |
| 172 |
- |
| 173 |
namespace osl |
| 174 |
{ |
| 175 |
class File; |
| 176 |
@@ -63,9 +56,6 @@ class OOutputStreamWrapper : public OutputStreamWrapper_Base |
| 177 |
public: |
| 178 |
OOutputStreamWrapper(::osl::File& _rStream) :rStream(_rStream) { } |
| 179 |
|
| 180 |
-// UNO Anbindung |
| 181 |
- DECLARE_UNO3_AGG_DEFAULTS(OOutputStreamWrapper, OutputStreamWrapper_Base); |
| 182 |
- |
| 183 |
// stario::XOutputStream |
| 184 |
virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 185 |
virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 186 |
diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx b/comphelper/inc/comphelper/oslfile2streamwrap.hxx |
| 187 |
index d636666..4d6c454 100644 |
| 188 |
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx |
| 189 |
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx |
| 190 |
@@ -44,10 +44,7 @@ namespace comphelper |
| 191 |
// FmUnoIOStream, |
| 192 |
// stream zum schreiben un lesen von Daten, basieren auf File |
| 193 |
//================================================================== |
| 194 |
-struct InputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XInputStream> |
| 195 |
-{}; |
| 196 |
- |
| 197 |
-class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public InputStreamWrapper_Base |
| 198 |
+class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XInputStream> |
| 199 |
{ |
| 200 |
::osl::Mutex m_aMutex; |
| 201 |
::osl::File* m_pFile; |
| 202 |
@@ -58,14 +55,6 @@ public: |
| 203 |
OSLInputStreamWrapper(::osl::File* pStream, sal_Bool bOwner=sal_False); |
| 204 |
virtual ~OSLInputStreamWrapper(); |
| 205 |
|
| 206 |
-// UNO Anbindung |
| 207 |
- virtual void SAL_CALL acquire() throw() |
| 208 |
- { InputStreamWrapper_Base::acquire(); } |
| 209 |
- virtual void SAL_CALL release() throw() |
| 210 |
- { InputStreamWrapper_Base::release(); } |
| 211 |
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) |
| 212 |
- { return InputStreamWrapper_Base::queryInterface(_rType); } |
| 213 |
- |
| 214 |
// stario::XInputStream |
| 215 |
virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 216 |
virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 217 |
@@ -78,24 +67,13 @@ public: |
| 218 |
// FmUnoOutStream, |
| 219 |
// Datensenke fuer Files |
| 220 |
//================================================================== |
| 221 |
-struct OutputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XOutputStream> |
| 222 |
-{}; |
| 223 |
- |
| 224 |
-class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public OutputStreamWrapper_Base |
| 225 |
+class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream> |
| 226 |
{ |
| 227 |
::osl::File& rFile; |
| 228 |
|
| 229 |
public: |
| 230 |
OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { } |
| 231 |
|
| 232 |
-// UNO Anbindung |
| 233 |
- virtual void SAL_CALL acquire() throw() |
| 234 |
- { OutputStreamWrapper_Base::acquire(); } |
| 235 |
- virtual void SAL_CALL release() throw() |
| 236 |
- { OutputStreamWrapper_Base::release(); } |
| 237 |
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) |
| 238 |
- { return OutputStreamWrapper_Base::queryInterface(_rType); } |
| 239 |
- |
| 240 |
// stario::XOutputStream |
| 241 |
virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 242 |
virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |
| 243 |
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx |
| 244 |
index cac22f4..dc8652e 100644 |
| 245 |
--- a/sc/source/filter/inc/xeroot.hxx |
| 246 |
+++ b/sc/source/filter/inc/xeroot.hxx |
| 247 |
@@ -168,7 +168,7 @@ private: |
| 248 |
XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const; |
| 249 |
|
| 250 |
private: |
| 251 |
- mutable XclExpRootData& mrExpData; /// Reference to the global export data struct. |
| 252 |
+ XclExpRootData& mrExpData; /// Reference to the global export data struct. |
| 253 |
}; |
| 254 |
|
| 255 |
// ============================================================================ |
| 256 |
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx |
| 257 |
index 1b4153e..83953e3 100644 |
| 258 |
--- a/sc/source/filter/inc/xiroot.hxx |
| 259 |
+++ b/sc/source/filter/inc/xiroot.hxx |
| 260 |
@@ -218,7 +218,7 @@ public: |
| 261 |
void ReadCodeName( XclImpStream& rStrm, bool bGlobals ); |
| 262 |
|
| 263 |
private: |
| 264 |
- mutable XclImpRootData& mrImpData; /// Reference to the global import data struct. |
| 265 |
+ XclImpRootData& mrImpData; /// Reference to the global import data struct. |
| 266 |
}; |
| 267 |
|
| 268 |
// ============================================================================ |
| 269 |
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx |
| 270 |
index 5e132fa..3f9f6fa 100644 |
| 271 |
--- a/sc/source/filter/inc/xlroot.hxx |
| 272 |
+++ b/sc/source/filter/inc/xlroot.hxx |
| 273 |
@@ -285,7 +285,7 @@ public: |
| 274 |
inline void IncCurrScTab() { ++mrData.mnScTab; } |
| 275 |
|
| 276 |
private: |
| 277 |
- mutable XclRootData& mrData; /// Reference to the global data struct. |
| 278 |
+ XclRootData& mrData; /// Reference to the global data struct. |
| 279 |
}; |
| 280 |
|
| 281 |
// ============================================================================ |
| 282 |
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx |
| 283 |
index f74b6ac..e51b959 100644 |
| 284 |
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx |
| 285 |
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx |
| 286 |
@@ -374,7 +374,7 @@ private: |
| 287 |
ODocumentDefinition& m_rDocumentDefinition; |
| 288 |
const ::com::sun::star::uno::Any m_aOldValue; |
| 289 |
const ::com::sun::star::uno::Any m_aNewValue; |
| 290 |
- mutable ::osl::ResettableMutexGuard& m_rClearForNotify; |
| 291 |
+ ::osl::ResettableMutexGuard& m_rClearForNotify; |
| 292 |
|
| 293 |
void impl_fireEvent_throw( const sal_Bool i_bVetoable ); |
| 294 |
}; |
| 295 |
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx |
| 296 |
index 043a214..02f6e00 100644 |
| 297 |
--- a/hwpfilter/source/list.hxx |
| 298 |
+++ b/hwpfilter/source/list.hxx |
| 299 |
@@ -41,6 +41,7 @@ |
| 300 |
* re-implements the same functionality, based on the STL. |
| 301 |
*/ |
| 302 |
|
| 303 |
+#include <cstddef> |
| 304 |
#include <vector> |
| 305 |
|
| 306 |
template<class T> |
| 307 |
|
| 308 |
--- basegfx/source/range/b2drangeclipper.cxx~ 2010-11-11 16:22:47.000000000 +0100 |
| 309 |
+++ basegfx/source/range/b2drangeclipper.cxx 2011-01-28 07:53:05.328565385 +0100 |
| 310 |
@@ -603,7 +603,6 @@ |
| 311 |
std::vector<B2DRange>::const_reverse_iterator aCurrRectR=rRanges.rbegin(); |
| 312 |
std::vector<B2VectorOrientation>::const_reverse_iterator aCurrOrientationR=rOrientations.rbegin(); |
| 313 |
const std::vector<B2DRange>::const_reverse_iterator aEndR=rRanges.rend(); |
| 314 |
- const std::vector<B2VectorOrientation>::const_reverse_iterator aEndOrientationR=rOrientations.rend(); |
| 315 |
while( aCurrRectR != aEndR ) |
| 316 |
{ |
| 317 |
const B2DRectangle& rCurrRect( *aCurrRectR++ ); |
Parent Directory
| 
Revision Log