[Libreoffice-commits] core.git: 3 commits - include/sfx2

[Tor Lillqvist]

 include/sfx2/objsh.hxx |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 5a27120a11bef343a2da909a1da3fed5dc710282
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Feb 13 10:23:34 2014 +0200

    INDEX_IGNORE is unused
    
    Change-Id: Ib7691a078c45f1eb8c78bd4e639503a732e3ef8c

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 85a4f23..3acdc4c 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -480,8 +480,6 @@ public:
     StarBASIC*                  GetBasic() const;
 
     // Interface Document content, Organizer
-#define INDEX_IGNORE USHRT_MAX
-
 #define CONTENT_STYLE 0
 #define CONTENT_CONFIG 1
 #define CONTENT_MACRO 2
commit 24deb95b9d7472a43f11f176df25a5fd8ae8be82
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Feb 13 10:11:51 2014 +0200

    Bin unused SVOBJ_MISCSTATUS_ defines
    
    Change-Id: I50c116a4d143b8ee20340f45c6624266371050ca

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4647f35..85a4f23 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -82,17 +82,8 @@ class Point;
 #define ASPECT_ALL      (ASPECT_CONTENT | ASPECT_THUMBNAIL | ASPECT_ICON | ASPECT_DOCPRINT)
 
 // must be the same as in OLE2
-#define SVOBJ_MISCSTATUS_SERVERRESIZE           1
-#define SVOBJ_MISCSTATUS_NOTREPLACE             4
-#define SVOBJ_MISCSTATUS_CANTLINKINSIDE         16
-#define SVOBJ_MISCSTATUS_LINK                   64
-#define SVOBJ_MISCSTATUS_INSIDEOUT              128
-#define SVOBJ_MISCSTATUS_ACTIVATEWHENVISIBLE    256
 #define SVOBJ_MISCSTATUS_NOTRESIZEABLE          512
-#define SVOBJ_MISCSTATUS_ALWAYSACTIVATE         1024
 #define SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE  2048
-#define SVOBJ_MISCSTATUS_SPECIALOBJECT          4096
-
 
 namespace sfx2
 {
commit cf6288443538e2b1c617595adc060810525e2ba6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Feb 13 10:09:46 2014 +0200

    Bin useless comments
    
    Change-Id: Iee3e292dd6c35f52c64d4a264a850def7ae15b0d

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 937e561..4647f35 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -75,14 +75,13 @@ class JobSetup;
 class Size;
 class Point;
 
-// From embobj.hxx
 #define ASPECT_CONTENT      1
 #define ASPECT_THUMBNAIL    2 /* 120 * 120, 6 Colors DIB in MetaFile */
 #define ASPECT_ICON         4
 #define ASPECT_DOCPRINT     8
 #define ASPECT_ALL      (ASPECT_CONTENT | ASPECT_THUMBNAIL | ASPECT_ICON | ASPECT_DOCPRINT)
 
-// from pseudo.hxx; must be the same as in OLE2
+// must be the same as in OLE2
 #define SVOBJ_MISCSTATUS_SERVERRESIZE           1
 #define SVOBJ_MISCSTATUS_NOTREPLACE             4
 #define SVOBJ_MISCSTATUS_CANTLINKINSIDE         16