slidecopy: merge CWS wth MWS-m76

3 files changed, 48 insertions, 16 deletions

diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index fac739b32583..6833fd6632ce 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -141,6 +141,24 @@
         return;   \
     }
 
+/** asserts a given condition (in debug mode), and continues the most-inner
+    loop if the condition is not met
+*/
+#define ENSURE_OR_CONTINUE( c, m ) \
+    if ( !(c) ) \
+    {   \
+        OSL_ENSURE( false, m ); \
+        continue;   \
+    }
 
+/** asserts a given condition (in debug mode), and continues the most-inner
+    loop if the condition is not met
+*/
+#define ENSURE_OR_BREAK( c, m ) \
+    if ( !(c) ) \
+    {   \
+        OSL_ENSURE( false, m ); \
+        break;  \
+    }
 
 #endif // TOOLS_DIAGNOSE_EX_H
diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 85da22126b77..308cc02165ce 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -420,6 +420,7 @@ public:
     Point               Center() const;
 
     void                Move( long nHorzMove, long nVertMove );
+    inline void         Transpose();
     inline void         SetPos( const Point& rPoint );
     void                SetSize( const Size& rSize );
     inline Size         GetSize() const;
@@ -578,6 +579,20 @@ inline void Rectangle::Move( long nHorzMove, long nVertMove )
         nBottom += nVertMove;
 }
 
+void Rectangle::Transpose()
+{
+    if ( !IsEmpty() )
+    {
+        long swap( nLeft );
+        nLeft = nTop;
+        nTop = swap;
+
+        swap = nRight;
+        nRight = nBottom;
+        nBottom = swap;
+    }
+}
+
 inline void Rectangle::SetPos( const Point& rPoint )
 {
     if ( nRight != RECT_EMPTY )
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 86a8114ab0b8..17d52432e206 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -125,22 +125,21 @@ enum INetProtocol
     INET_PROT_DATA = 15,
     INET_PROT_CID = 16,
     INET_PROT_OUT = 17,
-    INET_PROT_VND_SUN_STAR_WFS = 18,
-    INET_PROT_VND_SUN_STAR_HIER = 19,
-    INET_PROT_VIM = 20,
-    INET_PROT_UNO = 21,
-    INET_PROT_COMPONENT = 22,
-    INET_PROT_VND_SUN_STAR_PKG = 23,
-    INET_PROT_LDAP = 24,
-    INET_PROT_DB = 25,
-    INET_PROT_VND_SUN_STAR_CMD = 26,
-    INET_PROT_VND_SUN_STAR_ODMA = 27,
-    INET_PROT_TELNET = 28,
-    INET_PROT_VND_SUN_STAR_EXPAND = 29,
-    INET_PROT_VND_SUN_STAR_TDOC = 30,
-    INET_PROT_GENERIC = 31,
-    INET_PROT_SMB = 32,
-    INET_PROT_END = 33
+    INET_PROT_VND_SUN_STAR_HIER = 18,
+    INET_PROT_VIM = 19,
+    INET_PROT_UNO = 20,
+    INET_PROT_COMPONENT = 21,
+    INET_PROT_VND_SUN_STAR_PKG = 22,
+    INET_PROT_LDAP = 23,
+    INET_PROT_DB = 24,
+    INET_PROT_VND_SUN_STAR_CMD = 25,
+    INET_PROT_VND_SUN_STAR_ODMA = 26,
+    INET_PROT_TELNET = 27,
+    INET_PROT_VND_SUN_STAR_EXPAND = 28,
+    INET_PROT_VND_SUN_STAR_TDOC = 29,
+    INET_PROT_GENERIC = 30,
+    INET_PROT_SMB = 31,
+    INET_PROT_END = 32
 };
 
 //============================================================================